Compare commits

..
Author SHA1 Message Date
くぁーりぃ 6d9ec0c0da Backport some of REI bookmark features (#296)
* add placeholder bookmark drop

* add item panel to bookmark panel injection support

* fix outofboundsexception

* fix drag'n drop voids bookmark

* add itemstack moving animation

* implement pop animation

* fix crashes

* disable ItemPanel Animation

* disable pop animation on bookmark load

* spotlessapply

* disable move animation on gui scale

* add config option
2022-09-18 12:08:16 +02:00
くぁーりぃ 617ac0600d Add search history (#294)
* add search history

* spotlessApply

* linkedlist->arraylist
2022-09-10 18:35:48 +02:00
7d7e3b61a6 Fix other mods cannot mixin GuiContainer.java when NEI is loaded (#291)
Co-authored-by: くぁーりぃ <[email protected]>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-05 18:47:51 +08:00
miozune 748695158f Allow using handlerId for handler order (#290) 2022-09-03 10:25:40 +02:00
DrParadox7 a2c037e0c0 Update Handlers (#288)
Updated Handlers and Catalyst for the following:
-Minefactory Reloaded
-GregTech 4
-Nuclearcraft
2022-08-31 17:30:14 +02:00
miozune e93d23e444 Show message while loading itempanel (#286)
* Show message while loading itempanel

* Move to ItemsGrid

* Add bookmark message

* ItemList

* Revert "Add bookmark message"

This reverts commit 030b5ed1ef.

* Item List

* Use Label

* clean
2022-08-31 10:43:22 +02:00
miozune 748cfe3754 Fix crash when itempanel is not initialized yet (#285) 2022-08-28 14:23:11 +02:00
firenoo b64d104d7e README.md: Add some documentation for getting started on development (#283) 2022-08-27 17:19:09 +02:00
16 changed files with 497 additions and 66 deletions

No files matched your search

+7
View File
@@ -27,6 +27,13 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
* Remove TMI style
* Removed inventory Load/Save state
## Development
Before launching, you need to add
```
-Dfml.coreMods.load=codechicken.nei.asm.NEICorePlugin
```
as a command line argument to the VM.
## License
GTNH Modifications Copyright (c) 2019-2022 mitchej123 and the GTNH Team
@@ -0,0 +1,76 @@
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 final boolean doMoveAnim;
private final boolean doPopAnim;
public ItemStack itemStack;
public AnimatedItemStack(ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
this.itemStack = itemStack;
this.doMoveAnim = doMoveAnim;
this.doPopAnim = doPopAnim;
}
public void drawItem(int x, int y) {
drawItem(x, y, false, null, false);
}
public void drawItem(int x, int y, boolean smallAmount, String stackSize, boolean blockMoveAnimOnce) {
if (NEIClientConfig.areBookmarksAnimated()) {
if (doPopAnim && currentScale < 1) {
drawPoppingItem(x, y, smallAmount, stackSize);
return;
}
if (doMoveAnim && (lastPosX != x || lastPosY != y) && !blockMoveAnimOnce) {
drawMovingItem(x, y, smallAmount, stackSize);
return;
}
}
currentScale = 1;
lastPosX = x;
lastPosY = y;
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);
}
}
}
+166 -23
View File
@@ -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;
}
}
@@ -219,14 +222,24 @@ public class BookmarkPanel extends PanelWidget {
return metadata.get(idx);
}
public void addItem(ItemStack stackA, BookmarkStackMeta meta) {
realItems.add(stackA);
public void addItem(ItemStack stackA, BookmarkStackMeta meta, boolean doPopAnim) {
addRealItem(stackA, true, doPopAnim);
metadata.add(meta);
onGridChanged();
}
public void addItem(ItemStack stackA, BookmarkStackMeta meta, int index) {
if (index == -1) {
addItem(stackA, meta, true);
return;
}
addRealItem(index, stackA, true, true);
metadata.add(index, meta);
onGridChanged();
}
public void replaceItem(int idx, ItemStack stack) {
realItems.set(idx, stack);
setRealItem(idx, stack, true, true);
onGridChanged();
}
@@ -318,12 +331,14 @@ 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),
draggedStack == null);
if (meta.recipeId != null && !meta.ingredient && NEIClientConfig.showRecipeMarker()) {
drawRecipeMarker(rect.x, rect.y, GuiContainerManager.getFontRenderer(stack));
@@ -407,12 +422,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 +491,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 +502,8 @@ public class BookmarkPanel extends PanelWidget {
recipeId,
(saveStackSize ? 1 : -1) * nbTagA.getInteger("Count"),
false,
nbTagA.hasKey("gtFluidName")));
nbTagA.hasKey("gtFluidName")),
addIndex);
}
}
@@ -739,7 +770,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{}",
@@ -863,8 +895,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) {
@@ -893,7 +925,7 @@ public class BookmarkPanel extends PanelWidget {
final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
sortedGrid.removeItem(sortedStackIndex);
hoverGrid.addItem(stack, meta);
hoverGrid.addItem(stack, meta, true);
sortedNamespaceIndex = activeNamespaceIndex;
sortedStackIndex = hoverGrid.indexOf(stack, meta.recipeId);
@@ -935,7 +967,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 +1065,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 +1102,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 +1148,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 +1227,9 @@ public class BookmarkPanel extends PanelWidget {
BGrid.replaceItem(slotIndex, StackInfo.loadFromNBT(nbTag));
}
}
public void deleteDraggedMeta() {
draggedStackMeta = null;
draggedStackOriginIndex = -1;
}
}
@@ -37,6 +37,11 @@ public class ItemList {
private static final HashSet<Item> erroredItems = new HashSet<>();
private static final HashSet<String> stackTraces = new HashSet<>();
/**
* Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is
* actually finished or not.
*/
public static boolean loadFinished;
public static class EverythingItemFilter implements ItemFilter {
@Override
@@ -179,6 +184,7 @@ public class ItemList {
public void execute() {
// System.out.println("Executing NEI Item Loading");
ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
loadFinished = false;
LinkedList<ItemStack> items = new LinkedList<>();
LinkedList<ItemStack> permutations = new LinkedList<>();
@@ -218,6 +224,8 @@ public class ItemList {
for (ItemsLoadedCallback callback : loadCallbacks) callback.itemsLoaded();
updateFilter.restart();
loadFinished = true;
}
};
+7 -1
View File
@@ -57,7 +57,8 @@ public class ItemPanel extends PanelWidget {
public void refresh(GuiContainer gui) {
if (newItems != null) {
realItems = newItems;
realItems.clear();
addRealItems(newItems, false, false);
newItems = null;
onGridChanged();
}
@@ -73,6 +74,11 @@ public class ItemPanel extends PanelWidget {
super.drawSlotOutline(focused, slotIdx, rect);
}
}
@Override
public String getMessageOnEmpty() {
return ItemList.loadFinished ? null : NEIClientUtils.translate("itempanel.loading");
}
}
public ItemPanel() {
+38 -5
View File
@@ -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;
@@ -41,17 +43,35 @@ public class ItemsGrid {
protected boolean[] invalidSlotMap;
protected Label messageLabel = new Label(getMessageOnEmpty(), true);
@Nullable
private Framebuffer framebuffer = null;
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 doMoveAnim, boolean doPopAnim) {
itemStack.forEach(e -> addRealItem(e, doMoveAnim, doPopAnim));
}
protected void addRealItem(ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
realItems.add(new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
}
protected void addRealItem(int index, ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
realItems.add(index, new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
}
protected void setRealItem(int index, ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
realItems.set(index, new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
}
public int size() {
@@ -61,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;
}
}
@@ -104,6 +124,9 @@ public class ItemsGrid {
rows = height / SLOT_SIZE;
paddingLeft = (width % SLOT_SIZE) / 2;
messageLabel.x = marginLeft + width / 2;
messageLabel.y = marginTop + height / 2;
}
public void shiftPage(int shift) {
@@ -305,8 +328,14 @@ public class ItemsGrid {
}
}
public void setVisible() {
if (getItems().isEmpty() && getMessageOnEmpty() != null) {
LayoutManager.addWidget(messageLabel);
}
}
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) {
@@ -345,4 +374,8 @@ public class ItemsGrid {
return r >= rows || c >= columns || !isInvalidSlot(slt);
}
public String getMessageOnEmpty() {
return null;
}
}
@@ -112,6 +112,12 @@ public class LayoutManager
public static HashMap<Integer, LayoutStyle> layoutStyles = new HashMap<>();
/**
* This is set to true immediately after item loading thread is started,
* to prevent duplicated loading thread from being executed.
* If you want to know if item list is actually finished loading,
* Use {@link ItemList#loadFinished} instead.
*/
public static boolean itemsLoaded = false;
/**
@@ -88,7 +88,13 @@ public class NEIClientConfig {
handler -> Objects.firstNonNull(handler.getOverlayIdentifier(), handler.getHandlerId());
public static int getHandlerOrder(IRecipeHandler handler) {
return handlerOrdering.getOrDefault(HANDLER_ID_FUNCTION.apply(handler), 0);
if (handlerOrdering.get(handler.getOverlayIdentifier()) != null) {
return handlerOrdering.get(handler.getOverlayIdentifier());
}
if (handlerOrdering.get(handler.getHandlerId()) != null) {
return handlerOrdering.get(handler.getHandlerId());
}
return 0;
}
// Comparator that compares handlers using the handlerOrdering map.
@@ -231,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);
@@ -338,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);
@@ -496,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");
}
+26 -31
View File
@@ -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;
@@ -160,6 +160,7 @@ public abstract class PanelWidget extends Widget {
LayoutManager.addWidget(pagePrev);
LayoutManager.addWidget(pageNext);
LayoutManager.addWidget(pageLabel);
grid.setVisible();
}
}
@@ -182,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) {
@@ -240,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);
@@ -257,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) {
@@ -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;
}
}
@@ -238,9 +238,9 @@ public class NEITransformer implements IClassTransformer {
@Override
public void transform(MethodNode mv) {
ASMHelper.logger.debug("NEI: Injecting mouseUp call");
ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto");
ASMBlock needleBlock = asmblocks.get("n_mouseUp");
ASMBlock injectionBlock = asmblocks.get("mouseUp");
ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto").copy();
ASMBlock needleBlock = asmblocks.get("n_mouseUp").copy();
ASMBlock injectionBlock = asmblocks.get("mouseUp").copy();
gotoBlock.mergeLabels(injectionBlock);
findOnce(mv.instructions, gotoBlock.list).replace(gotoBlock.list.list);
@@ -163,6 +163,7 @@ public class GuiPanelSettings extends GuiScreenWidget {
final int rows = (h - (PANEL_SIZE + 2) * 2) / ItemsGrid.SLOT_SIZE;
final int paddingLeft = (w % ItemsGrid.SLOT_SIZE) / 2;
final ArrayList<ItemStack> items = ItemPanels.itemPanel.getItems();
if (items.isEmpty()) return;
for (int r = 0; r < rows; r++) {
for (int c = 0; c < columns; c++) {
@@ -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);
}
}
@@ -467,7 +467,15 @@ exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:2,,exnihilo
exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:3,,exnihilo,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:4,,exnihilo,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:5,,exnihilo,TRUE,,,,,,
crafting,gregtech_addon:machine:16,,gregtech_addon,TRUE,,,,,,
crafting,gregtech_addon:machine:112,,gregtech_addon,TRUE,,,,,,
crafting,gregtech_addon:machine:128,,gregtech_addon,TRUE,,,,,,
smelting,gregtech_addon:machine:131,,gregtech_addon,TRUE,,,,,,
smelting,gregtech_addon:machine:138,,gregtech_addon,TRUE,,,,,,
smelting,gregtech_addon:machine:54,,gregtech_addon,TRUE,,,,,,
smelting,gregtech_addon:machine:63,,gregtech_addon,TRUE,,,,,,
gregtech.Alloy,gregtech_addon:machine:56,,gregtech_addon,TRUE,,,,,,
gregtechmod.integration.nei.handlers.AlloySmelterRecipeHandler,gregtech_addon:machine:132,,gregtech_addon,TRUE,,,,,,
gregtech.Assembler,gregtech_addon:machine:60,,gregtech_addon,TRUE,,,,,,
gregtech.Bender,gregtech_addon:machine:59,,gregtech_addon,TRUE,,,,,,
gregtech.Blast,gregtech_addon:machine:29,,gregtech_addon,TRUE,,,,,,
@@ -494,6 +502,13 @@ gregtech.Lathe,gregtech_addon:machine:111,,gregtech_addon,TRUE,,,,,,
gregtech.Sawmill,gregtech_addon:machine:32,,gregtech_addon,TRUE,,,,,,
gregtech.VacuumFreezer,gregtech_addon:machine:38,,gregtech_addon,TRUE,,,,,,
gregtech.Wiremill,gregtech_addon:machine:55,,gregtech_addon,TRUE,,,,,,
ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:130,,gregtech_addon,TRUE,,,,,,
ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:50,,gregtech_addon,TRUE,,,,,,
ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:64,,gregtech_addon,TRUE,,,,,,
ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler,gregtech_addon:machine:51,,gregtech_addon,TRUE,,,,,,
ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler,gregtech_addon:machine:135,,gregtech_addon,TRUE,,,,,,
ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler,gregtech_addon:machine:52,,gregtech_addon,TRUE,,,,,,
ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler,gregtech_addon:machine:134,,gregtech_addon,TRUE,,,,,,
wanion.biggercraftingtables.nei.BigShapedRecipeHandler,biggercraftingtables:BiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,this and below are not tested
wanion.biggercraftingtables.nei.BigShapedRecipeHandler,biggercraftingtables:AutoBiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,
wanion.biggercraftingtables.nei.BigShapelessRecipeHandler,biggercraftingtables:BiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,
@@ -527,6 +542,10 @@ nc.crafting.nei.CoolerRecipeHandler,NuclearCraft:coolerIdle,,NuclearCraft,TRUE,,
nc.crafting.nei.HeliumExtractorRecipeHandler,NuclearCraft:heliumExtractorIdle,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.RecyclerRecipeHandler,NuclearCraft:recyclerIdle,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft:nuclearWorkspace,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.FissionRecipeHandler,NuclearCraft:fissionReactorGraphiteIdle,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.FissionSteamRecipeHandler,NuclearCraft:fissionReactorSteamIdle,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.FusionRecipeHandler,NuclearCraft:fusionReactor,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.FusionSteamRecipeHandler,NuclearCraft:fusionReactorSteam,,NuclearCraft,TRUE,,,,,,
ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,etfuturum:smoker,,etfuturum,TRUE,,,,,,not working well
ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,etfuturum:blast_furnace,,etfuturum,TRUE,,,,,,not working well
connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,campfirebackport:campfire,,campfirebackport,TRUE,,,,,,
@@ -1316,4 +1335,9 @@ crafting,BiblioCraft:BiblioWorkbench:4,,BiblioCraft,TRUE,,,,,,
crafting,BiblioCraft:BiblioWorkbench:5,,BiblioCraft,TRUE,,,,,,
crafting,BiblioCraft:BiblioWorkbench:6,,BiblioCraft,TRUE,,,,,,
crafting,ComputerCraft:CC-TurtleExpanded,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,
crafting,ComputerCraft:CC-TurtleAdvanced,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,
crafting,ComputerCraft:CC-TurtleAdvanced,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester,MineFactoryReloaded:machine.0:2,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactoryReloaded:machine.0:10,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder,MineFactoryReloaded:machine.0:13,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse,MineFactoryReloaded:machine.1:13,,MineFactoryReloaded,TRUE,,,,,,
1 handler itemName nbtInfo modId modRequired excludedModId priority minVersion maxVersion forceClassName itemNotes
467 exnihilo.compatibility.nei.RecipeHandlerSieve exnihilo:sifting_table:3 exnihilo TRUE
468 exnihilo.compatibility.nei.RecipeHandlerSieve exnihilo:sifting_table:4 exnihilo TRUE
469 exnihilo.compatibility.nei.RecipeHandlerSieve exnihilo:sifting_table:5 exnihilo TRUE
470 crafting gregtech_addon:machine:16 gregtech_addon TRUE
471 crafting gregtech_addon:machine:112 gregtech_addon TRUE
472 crafting gregtech_addon:machine:128 gregtech_addon TRUE
473 smelting gregtech_addon:machine:131 gregtech_addon TRUE
474 smelting gregtech_addon:machine:138 gregtech_addon TRUE
475 smelting gregtech_addon:machine:54 gregtech_addon TRUE
476 smelting gregtech_addon:machine:63 gregtech_addon TRUE
477 gregtech.Alloy gregtech_addon:machine:56 gregtech_addon TRUE
478 gregtechmod.integration.nei.handlers.AlloySmelterRecipeHandler gregtech_addon:machine:132 gregtech_addon TRUE
479 gregtech.Assembler gregtech_addon:machine:60 gregtech_addon TRUE
480 gregtech.Bender gregtech_addon:machine:59 gregtech_addon TRUE
481 gregtech.Blast gregtech_addon:machine:29 gregtech_addon TRUE
502 gregtech.Sawmill gregtech_addon:machine:32 gregtech_addon TRUE
503 gregtech.VacuumFreezer gregtech_addon:machine:38 gregtech_addon TRUE
504 gregtech.Wiremill gregtech_addon:machine:55 gregtech_addon TRUE
505 ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler gregtech_addon:machine:130 gregtech_addon TRUE
506 ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler gregtech_addon:machine:50 gregtech_addon TRUE
507 ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler gregtech_addon:machine:64 gregtech_addon TRUE
508 ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler gregtech_addon:machine:51 gregtech_addon TRUE
509 ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler gregtech_addon:machine:135 gregtech_addon TRUE
510 ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler gregtech_addon:machine:52 gregtech_addon TRUE
511 ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler gregtech_addon:machine:134 gregtech_addon TRUE
512 wanion.biggercraftingtables.nei.BigShapedRecipeHandler biggercraftingtables:BiggerCraftingTables biggercraftingtables TRUE this and below are not tested
513 wanion.biggercraftingtables.nei.BigShapedRecipeHandler biggercraftingtables:AutoBiggerCraftingTables biggercraftingtables TRUE
514 wanion.biggercraftingtables.nei.BigShapelessRecipeHandler biggercraftingtables:BiggerCraftingTables biggercraftingtables TRUE
542 nc.crafting.nei.HeliumExtractorRecipeHandler NuclearCraft:heliumExtractorIdle NuclearCraft TRUE
543 nc.crafting.nei.RecyclerRecipeHandler NuclearCraft:recyclerIdle NuclearCraft TRUE
544 nc.crafting.nei.NuclearWorkspaceRecipeHandler NuclearCraft:nuclearWorkspace NuclearCraft TRUE
545 nc.crafting.nei.FissionRecipeHandler NuclearCraft:fissionReactorGraphiteIdle NuclearCraft TRUE
546 nc.crafting.nei.FissionSteamRecipeHandler NuclearCraft:fissionReactorSteamIdle NuclearCraft TRUE
547 nc.crafting.nei.FusionRecipeHandler NuclearCraft:fusionReactor NuclearCraft TRUE
548 nc.crafting.nei.FusionSteamRecipeHandler NuclearCraft:fusionReactorSteam NuclearCraft TRUE
549 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker etfuturum:smoker etfuturum TRUE not working well
550 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace etfuturum:blast_furnace etfuturum TRUE not working well
551 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler campfirebackport:campfire campfirebackport TRUE
1335 crafting BiblioCraft:BiblioWorkbench:5 BiblioCraft TRUE
1336 crafting BiblioCraft:BiblioWorkbench:6 BiblioCraft TRUE
1337 crafting ComputerCraft:CC-TurtleExpanded {leftUpgrade:2} ComputerCraft TRUE
1338 crafting ComputerCraft:CC-TurtleAdvanced {leftUpgrade:2} ComputerCraft TRUE
1339 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester MineFactoryReloaded:machine.0:2 MineFactoryReloaded TRUE
1340 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer MineFactoryReloaded:machine.0:10 MineFactoryReloaded TRUE
1341 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder MineFactoryReloaded:machine.0:13 MineFactoryReloaded TRUE
1342 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor MineFactoryReloaded:machine.1:10 MineFactoryReloaded TRUE
1343 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse MineFactoryReloaded:machine.1:13 MineFactoryReloaded TRUE
+11 -1
View File
@@ -491,6 +491,11 @@ nc.crafting.nei.CoolerRecipeHandler,NuclearCraft,NuclearCraft:coolerIdle,,Nuclea
nc.crafting.nei.HeliumExtractorRecipeHandler,NuclearCraft,NuclearCraft:heliumExtractorIdle,,NuclearCraft,TRUE,,,65,166,5,,,,,,
nc.crafting.nei.RecyclerRecipeHandler,NuclearCraft,NuclearCraft:recyclerIdle,,NuclearCraft,TRUE,,,65,166,5,,,,,,
nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft,NuclearCraft:nuclearWorkspace,,NuclearCraft,TRUE,,,130,,2,,,,,,
nc.crafting.nei.InfoUsageHandler,NuclearCraft,NuclearCraft:fuel,,NuclearCraft,TRUE,,,,,,,,,,,
nc.crafting.nei.FissionRecipeHandler,NuclearCraft,NuclearCraft:fissionReactorGraphiteIdle,,NuclearCraft,TRUE,,,,,,,,,,,
nc.crafting.nei.FissionSteamRecipeHandler,NuclearCraft,NuclearCraft:fissionReactorSteamIdle,,NuclearCraft,TRUE,,,,,,,,,,,
nc.crafting.nei.FusionRecipeHandler,NuclearCraft,NuclearCraft:fusionReactor,,NuclearCraft,TRUE,,,,,,,,,,,
nc.crafting.nei.FusionSteamRecipeHandler,NuclearCraft,NuclearCraft:fusionReactorSteam,,NuclearCraft,TRUE,,,,,,,,,,,
ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,EtFuturum Requiem,etfuturum:lit_smoker,,etfuturum,TRUE,,,65,166,5,,,,,,
ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,EtFuturum Requiem,etfuturum:lit_blast_furnace,,etfuturum,TRUE,,,65,166,5,,,,,,
connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,Campfire Backport,campfirebackport:campfire,,campfirebackport,TRUE,,,65,166,5,,,,,,
@@ -500,4 +505,9 @@ net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,Ex Compressum
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,Ex Compressum,exnihilo:barrel,,excompressum,TRUE,,,130,166,5,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,Ex Compressum,excompressum:compressedHammerIron,,excompressum,TRUE,,,58,166,10,,,,,,
com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropMutationHandler,AgriCraft,AgriCraft:cropsItem,,AgriCraft,TRUE,,,85,166,5,,,,,,
com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler,AgriCraft,minecraft:farmland,,AgriCraft,TRUE,,,85,166,5,,,,,,
com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler,AgriCraft,minecraft:farmland,,AgriCraft,TRUE,,,85,166,5,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester,MineFactory Reloaded,MineFactoryReloaded:machine.0:2,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactory Reloaded,MineFactoryReloaded:machine.0:10,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder,MineFactory Reloaded,MineFactoryReloaded:machine.0:13,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactory Reloaded,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse,MineFactory Reloaded,MineFactoryReloaded:machine.1:13,,MineFactoryReloaded,TRUE,,,,,,,,,,,
1 handler modName itemName nbtInfo modId modRequired excludedModId yShift handlerHeight handlerWidth maxRecipesPerPage imageResource imageX imageY imageWidth imageHeight itemNotes
491 nc.crafting.nei.HeliumExtractorRecipeHandler NuclearCraft NuclearCraft:heliumExtractorIdle NuclearCraft TRUE 65 166 5
492 nc.crafting.nei.RecyclerRecipeHandler NuclearCraft NuclearCraft:recyclerIdle NuclearCraft TRUE 65 166 5
493 nc.crafting.nei.NuclearWorkspaceRecipeHandler NuclearCraft NuclearCraft:nuclearWorkspace NuclearCraft TRUE 130 2
494 nc.crafting.nei.InfoUsageHandler NuclearCraft NuclearCraft:fuel NuclearCraft TRUE
495 nc.crafting.nei.FissionRecipeHandler NuclearCraft NuclearCraft:fissionReactorGraphiteIdle NuclearCraft TRUE
496 nc.crafting.nei.FissionSteamRecipeHandler NuclearCraft NuclearCraft:fissionReactorSteamIdle NuclearCraft TRUE
497 nc.crafting.nei.FusionRecipeHandler NuclearCraft NuclearCraft:fusionReactor NuclearCraft TRUE
498 nc.crafting.nei.FusionSteamRecipeHandler NuclearCraft NuclearCraft:fusionReactorSteam NuclearCraft TRUE
499 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker EtFuturum Requiem etfuturum:lit_smoker etfuturum TRUE 65 166 5
500 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace EtFuturum Requiem etfuturum:lit_blast_furnace etfuturum TRUE 65 166 5
501 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler Campfire Backport campfirebackport:campfire campfirebackport TRUE 65 166 5
505 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting Ex Compressum exnihilo:barrel excompressum TRUE 130 166 5
506 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer Ex Compressum excompressum:compressedHammerIron excompressum TRUE 58 166 10
507 com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropMutationHandler AgriCraft AgriCraft:cropsItem AgriCraft TRUE 85 166 5
508 com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler AgriCraft minecraft:farmland AgriCraft TRUE 85 166 5
509 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester MineFactory Reloaded MineFactoryReloaded:machine.0:2 MineFactoryReloaded TRUE
510 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer MineFactory Reloaded MineFactoryReloaded:machine.0:10 MineFactoryReloaded TRUE
511 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder MineFactory Reloaded MineFactoryReloaded:machine.0:13 MineFactoryReloaded TRUE
512 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor MineFactory Reloaded MineFactoryReloaded:machine.1:10 MineFactoryReloaded TRUE
513 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse MineFactory Reloaded MineFactoryReloaded:machine.1:13 MineFactoryReloaded TRUE
@@ -11,6 +11,7 @@ nei.bookmark.toggle.tip=Toggle visibility of the Bookmark Panel
nei.bookmark.viewmode.toggle.tip=Toggle Bookmark View Mode
nei.itempanel.quantity.default=One stack
nei.itempanel.loading=Loading Item List...
nei.enchant=Enchant
nei.enchant.level=Level
@@ -105,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
@@ -143,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