Compare commits

...
Author SHA1 Message Date
slprime a7683b885d Add another bookmark view mode (#261)
* add another bookmark view mode

* enum BookmarkViewMode
2022-06-23 00:03:29 +02:00
glowredman fe4566901a Update handlers and catalysts (#259)
New:
- Ex Astris
- Ex Compressum
- RFTools
- Steves Carts
- Thaumcraft NEI Plugin
- TC NEI Additions
- Bibliocraft
- ComputerCraft

Updated:
- Thermal Expansion
- Project Red
2022-06-08 16:12:47 +02:00
embeddedt de2b2ece69 Fix minor memory leaks (#258)
* Fix memory leak caused by mob spawner items

* Use a weak hash map instead of manually clearing the map

* Clear manager reference to prevent holding a WorldClient reference through the GUI

* Revert "Use a weak hash map instead of manually clearing the map"

This reverts commit 91bb997250.
2022-06-06 17:05:02 +02:00
Kiwiand[Kiwi233] d20a80a77c Update zh_CN.lang (#257)
* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang

Co-authored-by: [Kiwi233] <[[email protected]]>
2022-06-04 22:57:15 +02:00
11 changed files with 453 additions and 120 deletions

No files matched your search

+281 -63
View File
@@ -21,12 +21,12 @@ import org.lwjgl.opengl.GL11;
import javax.annotation.Nullable;
import static codechicken.nei.NEIClientUtils.translate;
import static codechicken.lib.gui.GuiDraw.getMousePosition;
import static codechicken.lib.gui.GuiDraw.drawRect;
import java.awt.Point;
import java.io.File;
import java.io.FileReader;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.FileInputStream;
@@ -52,7 +52,7 @@ public class BookmarkPanel extends PanelWidget
public Label namespaceLabel;
protected ArrayList<BookmarkGrid> namespaces = new ArrayList<>();
protected List<BookmarkGrid> namespaces = new ArrayList<>();
protected int activeNamespaceIndex = 0;
@@ -74,10 +74,152 @@ public class BookmarkPanel extends PanelWidget
}
public static enum BookmarkViewMode
{
DEFAULT, TODO_LIST
}
protected static class BookmarkGrid extends ItemsGrid
{
protected List<List<Integer>> gridMask;
protected List<BookmarkStackMeta> metadata = new ArrayList<>();
protected BookmarkViewMode viewMode = BookmarkViewMode.DEFAULT;
protected boolean[] todoSpaces;
protected int todoItemsCount = 0;
public void setViewMode(BookmarkViewMode mode)
{
if (viewMode == mode) {
return;
}
viewMode = mode;
if (mode == BookmarkViewMode.DEFAULT) {
sortIngredients(false);
todoItemsCount = 0;
gridMask = null;
}
onGridChanged();
}
public BookmarkViewMode getViewMode()
{
return viewMode;
}
@Override
public int getNumPages()
{
if (gridMask != null) {
return gridMask.size();
}
return super.getNumPages();
}
@Override
protected List<Integer> getMask()
{
if (gridMask != null) {
return gridMask.size() > page? gridMask.get(page): new ArrayList<>();
}
return super.getMask();
}
private void sortIngredients(final boolean forward)
{
BookmarkStackMeta meta;
int dir = forward? 1: -1;
for (int i = 0; i < realItems.size(); i++) {
meta = metadata.get(i);
if (meta.recipeId != null && !meta.ingredient) {
int shift = 0;
for (int j = i + 1; j < realItems.size(); j++) {
if (meta.recipeId.equals(metadata.get(j).recipeId)) {
if (i + shift + dir != j) {
realItems.add(i + shift + Math.max(dir, 0), realItems.remove(j));
metadata.add(i + shift + Math.max(dir, 0), metadata.remove(j));
}
shift++;
}
}
for (int j = i + shift - 1; j >= 0; j--) {
if (meta.recipeId.equals(metadata.get(j).recipeId)) {
if (i + shift + dir != j) {
realItems.add(i + shift + Math.min(dir, 0), realItems.remove(j));
metadata.add(i + shift + Math.min(dir, 0), metadata.remove(j));
}
shift--;
}
}
i += Math.max(0, shift);
}
}
}
private void generateToDoSpaces()
{
todoItemsCount = 0;
gridMask = new ArrayList<>();
if (rows * columns == 0) {
return;
}
BookmarkStackMeta meta;
int size = size();
int idx = 0;
while (idx < size) {
ArrayList<Integer> pmask = new ArrayList<>();
for (int i = 0, perPage = rows * columns; i < perPage && idx < size; i++) {
if (isInvalidSlot(i)) {
pmask.add(null);
} else {
meta = getMetadata(idx);
if (idx > 0 && ((i % columns) == 0) == (meta.recipeId != null && meta.ingredient && meta.recipeId.equals(getRecipeId(idx - 1)))) {
pmask.add(null);
} else {
pmask.add(idx++);
if ((i % columns) == 0) {
todoItemsCount++;
}
}
}
}
gridMask.add(pmask);
}
}
protected void onGridChanged()
{
super.onGridChanged();
if (getViewMode() == BookmarkViewMode.TODO_LIST) {
sortIngredients(true);
generateToDoSpaces();
}
}
public int indexOf(ItemStack stackA, BookmarkRecipeId recipeId)
{
final boolean useNBT = NEIClientConfig.useNBTInBookmarks();
@@ -101,20 +243,20 @@ public class BookmarkPanel extends PanelWidget
{
realItems.add(stackA);
metadata.add(meta);
refreshBuffer = true;
onGridChanged();
}
public void replaceItem(int idx, ItemStack stack)
{
realItems.set(idx, stack);
refreshBuffer = true;
onGridChanged();
}
public void removeRecipe(int idx, boolean removeFullRecipe)
{
final BookmarkStackMeta meta = getMetadata(idx);
if (removeFullRecipe && meta.recipeId != null) {
if (meta.recipeId != null && (removeFullRecipe || !meta.ingredient)) {
removeRecipe(meta.recipeId);
} else {
removeItem(idx);
@@ -141,7 +283,7 @@ public class BookmarkPanel extends PanelWidget
{
realItems.remove(idx);
metadata.remove(idx);
refreshBuffer = true;
onGridChanged();
return true;
}
@@ -167,23 +309,26 @@ public class BookmarkPanel extends PanelWidget
{
realItems.add(dst, realItems.remove(src));
metadata.add(dst, metadata.remove(src));
refreshBuffer = true;
onGridChanged();
}
private boolean isPartOfFocusedRecipe(ItemPanelSlot focused, int myIdx) {
return (NEIClientUtils.shiftKey()
&& LayoutManager.bookmarkPanel.sortedStackIndex == -1
private boolean isPartOfFocusedRecipe(ItemPanelSlot focused, int myIdx)
{
return NEIClientUtils.shiftKey()
&& focused != null
&& LayoutManager.bookmarkPanel.sortedStackIndex == -1
&& getRecipeId(focused.slotIndex) != null
&& getRecipeId(myIdx) != null
&& getRecipeId(focused.slotIndex).equals(getRecipeId(myIdx)));
&& getRecipeId(focused.slotIndex).equals(getRecipeId(myIdx));
}
@Override
protected void drawSlotOutline(@Nullable ItemPanelSlot focus, int idx, Rectangle4i rect) {
if(LayoutManager.bookmarkPanel.sortedNamespaceIndex == LayoutManager.bookmarkPanel.activeNamespaceIndex && LayoutManager.bookmarkPanel.sortedStackIndex == idx) {
protected void drawSlotOutline(@Nullable ItemPanelSlot focus, int idx, Rectangle4i rect)
{
if (LayoutManager.bookmarkPanel.sortedNamespaceIndex == LayoutManager.bookmarkPanel.activeNamespaceIndex && LayoutManager.bookmarkPanel.sortedStackIndex == idx) {
drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555);//highlight
} else if(focus != null) {
} else if (focus != null) {
BookmarkStackMeta meta = getMetadata(idx);
if (isPartOfFocusedRecipe(focus, idx)) {
drawRect(rect.x, rect.y, rect.w, rect.h, meta.ingredient? 0x88b3b300: 0x88009933);//highlight recipe
@@ -283,7 +428,13 @@ public class BookmarkPanel extends PanelWidget
@Override
public String getLabelText()
{
return String.format("(%d/%d) [%d]", getPage(), Math.max(1, getNumPages()), grid.size());
int size = grid.size();
if (((BookmarkGrid) grid).getViewMode() == BookmarkViewMode.TODO_LIST) {
size = ((BookmarkGrid) grid).todoItemsCount;
}
return String.format("(%d/%d) [%d]", getPage(), Math.max(1, getNumPages()), size);
}
@@ -325,7 +476,7 @@ public class BookmarkPanel extends PanelWidget
BGrid.removeRecipe(recipeId);
for (PositionedStack stack : ingredients) {
for (PositionedStack stack : ingredients) {
final NBTTagCompound nbTag = StackInfo.itemStackToNBT(stack.item, saveStackSize);
if (unique.get(nbTag) == null) {
@@ -337,7 +488,7 @@ public class BookmarkPanel extends PanelWidget
}
for (NBTTagCompound nbTag : sorted) {
for (NBTTagCompound nbTag : sorted) {
nbTag.setInteger("Count", nbTag.getInteger("Count") * unique.get(nbTag));
BGrid.addItem(StackInfo.loadFromNBT(nbTag), new BookmarkStackMeta(recipeId, (saveStackSize ? 1: -1) * nbTag.getInteger("Count"), true, nbTag.hasKey("gtFluidName")));
}
@@ -346,7 +497,6 @@ public class BookmarkPanel extends PanelWidget
BGrid.addItem(normalizedA, new BookmarkStackMeta(recipeId, (saveStackSize ? 1: -1) * nbTagA.getInteger("Count"), false, nbTagA.hasKey("gtFluidName")));
}
}
@@ -515,9 +665,10 @@ public class BookmarkPanel extends PanelWidget
for (int grpIdx = 0; grpIdx < namespaces.size() - 1; grpIdx++) {
final BookmarkGrid grid = namespaces.get(grpIdx);
if (grpIdx > 0) {
strings.add("");//namespace separator; ignore first namespace
}
JsonObject settings = new JsonObject();
settings.add("viewmode", new JsonPrimitive(grid.getViewMode().toString()));
settings.add("active", new JsonPrimitive(activeNamespaceIndex == grpIdx));
strings.add("; " + NBTJson.toJson(settings));
for (int idx = 0; idx < grid.size(); idx++) {
@@ -579,19 +730,34 @@ public class BookmarkPanel extends PanelWidget
namespaces.clear();
namespaces.add(new BookmarkGrid());
activeNamespaceIndex = 0;
activeNamespaceIndex = -1;
final JsonParser parser = new JsonParser();
int namespaceIndex = 0;
for (String itemStr: itemStrings) {
try {
if (itemStr.isEmpty()) {
itemStr = "; {}";
}
if (namespaces.get(activeNamespaceIndex).size() > 0) {
if (itemStr.startsWith("; ")) {
JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject();
if (namespaces.get(namespaceIndex).size() > 0) {
//do not create empty namespaces
namespaces.add(new BookmarkGrid());
activeNamespaceIndex++;
namespaceIndex++;
}
if (settings.get("viewmode") != null) {
namespaces.get(namespaceIndex).setViewMode(BookmarkViewMode.valueOf(settings.get("viewmode").getAsString()));
}
if (settings.get("active") != null && settings.get("active").getAsBoolean()) {
activeNamespaceIndex = namespaceIndex;
}
continue;
@@ -615,7 +781,7 @@ public class BookmarkPanel extends PanelWidget
if (itemStack != null) {
namespaces.get(activeNamespaceIndex).addItem(itemStack, new BookmarkStackMeta(
namespaces.get(namespaceIndex).addItem(itemStack, new BookmarkStackMeta(
recipeId,
jsonObject.has("factor")? jsonObject.get("factor").getAsInt(): 0,
jsonObject.has("ingredient")? jsonObject.get("ingredient").getAsBoolean(): false,
@@ -630,8 +796,8 @@ public class BookmarkPanel extends PanelWidget
}
}
if (namespaces.get(activeNamespaceIndex).size() == 0) {
activeNamespaceIndex = Math.max(activeNamespaceIndex - 1, 0);
if (activeNamespaceIndex == -1) {
activeNamespaceIndex = namespaceIndex;
}
grid = namespaces.get(activeNamespaceIndex);
@@ -651,7 +817,7 @@ public class BookmarkPanel extends PanelWidget
{
final LayoutStyleMinecraft layout = (LayoutStyleMinecraft) LayoutManager.getLayoutStyle();
final int rows = (int) Math.ceil((double) layout.buttonCount / layout.numButtons);
final int diff = rows * 18 + getMarginTop(gui) - y;
final int diff = rows * BookmarkGrid.SLOT_SIZE + getMarginTop(gui) - y;
if (diff > 0) {
y += diff;
@@ -754,7 +920,7 @@ public class BookmarkPanel extends PanelWidget
return NEIServerUtils.copyStack(stack, amount);
}
@Override
public void mouseDragged(int mousex, int mousey, int button, long heldTime)
{
@@ -768,37 +934,59 @@ public class BookmarkPanel extends PanelWidget
if (stack != null && (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 250)) {
sortedNamespaceIndex = activeNamespaceIndex;
sortedStackIndex = mouseDownSlot;
grid.refreshBuffer = true;
grid.onGridChanged();
}
} else {
if (mouseOverSlot == null && sortedNamespaceIndex != activeNamespaceIndex) {
mouseOverSlot = getNextSlot(mousex, mousey);
}
if (mouseOverSlot != null) {
if (sortedNamespaceIndex != activeNamespaceIndex) {
BookmarkGrid BGrid = namespaces.get(sortedNamespaceIndex);
BookmarkStackMeta meta = BGrid.getMetadata(sortedStackIndex);
ItemStack stack = BGrid.getItem(sortedStackIndex);
BGrid.removeItem(sortedStackIndex);
((BookmarkGrid) grid).addItem(stack, meta);
sortedNamespaceIndex = activeNamespaceIndex;
sortedStackIndex = grid.size() - 1;
if (sortedNamespaceIndex != activeNamespaceIndex) {
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.slotIndex != sortedStackIndex) {
((BookmarkGrid) grid).moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
sortedStackIndex = mouseOverSlot.slotIndex;
if (mouseOverSlot != null) {
final ItemStack stack = sortedGrid.getItem(sortedStackIndex);
final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
sortedGrid.removeItem(sortedStackIndex);
hoverGrid.addItem(stack, meta);
sortedNamespaceIndex = activeNamespaceIndex;
sortedStackIndex = hoverGrid.indexOf(stack, meta.recipeId);
}
} else if (mouseOverSlot == null || mouseOverSlot.slotIndex != sortedStackIndex) {
final BookmarkGrid sortedGrid = namespaces.get(sortedNamespaceIndex);
if (mouseOverSlot != null && 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 (mouseOverSlot != null && 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);
}
}
}
}
}
return;
}
@@ -806,22 +994,21 @@ public class BookmarkPanel extends PanelWidget
super.mouseDragged(mousex, mousey, button, heldTime);
}
private ItemPanelSlot getNextSlot(int mousex, int mousey)
private ItemPanelSlot getNextSlot(int mousex, int mousey, boolean line)
{
int idx = grid.getPage() * grid.getPerPage() - grid.getPerPage();
int gSize = grid.size();
final List<Integer> mask = grid.getMask();
final int columns = grid.getColumns();
final int perPage = grid.getRows() * columns;
for (int i = 0; i < grid.getRows() * grid.getColumns() && idx <= gSize; i++) {
for (int i = mask.size(); i < perPage; i++) {
if (!grid.isInvalidSlot(i) && (!line || (i % columns) == 0)) {
if (!grid.isInvalidSlot(i)) {
if (idx == gSize && grid.getSlotRect(i).contains(mousex, mousey)) {
return new ItemPanelSlot(idx, null);
if (grid.getSlotRect(i).contains(mousex, mousey)) {
return new ItemPanelSlot(grid.size() - 1, null);
}
idx++;
return null;
}
}
return null;
@@ -840,6 +1027,37 @@ public class BookmarkPanel extends PanelWidget
super.postDraw(mousex, mousey);
}
@Override
public boolean handleClickExt(int mousex, int mousey, int button)
{
if (new Rectangle4i(pagePrev.x + pagePrev.w, pagePrev.y, pageNext.x - (pagePrev.x + pagePrev.w), pagePrev.h).contains(mousex, mousey)) {
final BookmarkGrid BGrid = (BookmarkGrid)grid;
if (BGrid.getViewMode() == BookmarkViewMode.DEFAULT) {
BGrid.setViewMode(BookmarkViewMode.TODO_LIST);
} else {
BGrid.setViewMode(BookmarkViewMode.DEFAULT);
}
saveBookmarks();
return true;
} else {
return super.handleClickExt(mousex, mousey, button);
}
}
@Override
public List<String> handleTooltip(int mx, int my, List<String> tooltip)
{
if (new Rectangle4i(pagePrev.x + pagePrev.w, pagePrev.y, pageNext.x - (pagePrev.x + pagePrev.w), pagePrev.h).contains(mx, my)) {
tooltip.add(translate("bookmark.viewmode.toggle.tip"));
}
return super.handleTooltip(mx, my, tooltip);
}
@Override
public void mouseUp(int mousex, int mousey, int button)
@@ -849,7 +1067,7 @@ public class BookmarkPanel extends PanelWidget
sortedNamespaceIndex = -1;
sortedStackIndex = -1;
mouseDownSlot = -1;
grid.refreshBuffer = true; /* make sure grid redraws the new item */
grid.onGridChanged(); /* make sure grid redraws the new item */
saveBookmarks();
} else {
super.mouseUp(mousex, mousey, button);
@@ -868,6 +1086,7 @@ public class BookmarkPanel extends PanelWidget
nextNamespace();
}
saveBookmarks();
return true;
}
@@ -900,7 +1119,6 @@ public class BookmarkPanel extends PanelWidget
shiftStackSize(slot.slotIndex, shift);
saveBookmarks();
return true;
}
@@ -299,6 +299,10 @@ public class ClientHandler
lastworld = null;
else if (gui instanceof GuiSelectWorld)
NEIClientConfig.reloadSaves();
else if(gui == null) {
/* prevent WorldClient reference being held in the Gui */
NEIController.manager = null;
}
}
lastGui = gui;
}
@@ -328,6 +332,8 @@ public class ClientHandler
if (!Minecraft.getMinecraft().isSingleplayer())//wait for server to initiate in singleplayer
NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
ItemMobSpawner.clearEntityReferences(world);
}
lastworld = world;
@@ -96,6 +96,10 @@ public class ItemMobSpawner extends ItemBlock
return e;
}
public static void clearEntityReferences(World newWorld) {
entityHashMap.values().removeIf(e -> e.worldObj != newWorld);
}
private void setDefaultTag(ItemStack itemstack) {
if (!IDtoNameMap.containsKey(itemstack.getItemDamage()))
itemstack.setItemDamage(idPig);
+1 -1
View File
@@ -69,7 +69,7 @@ public class ItemPanel extends PanelWidget
if (newItems != null) {
realItems = newItems;
newItems = null;
refreshBuffer = true;
onGridChanged();
}
super.refresh(gui);
+69 -43
View File
@@ -17,6 +17,7 @@ import org.lwjgl.opengl.GL11;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static codechicken.lib.gui.GuiDraw.drawRect;
@@ -37,13 +38,9 @@ public class ItemsGrid
protected int page;
protected int perPage;
protected int firstIndex;
protected int numPages;
protected int rows;
protected int columns;
protected boolean[] validSlotMap;
protected boolean[] invalidSlotMap;
@Nullable
@@ -89,7 +86,11 @@ public class ItemsGrid
public int getNumPages()
{
return numPages;
if (perPage > 0) {
return (int) Math.ceil((float) realItems.size() / (float) perPage);
}
return 0;
}
public int getRows()
@@ -104,9 +105,6 @@ public class ItemsGrid
public void setGridSize(int mleft, int mtop, int w, int h)
{
if(width != w || height != h || mleft != marginLeft || mtop != marginTop)
refreshBuffer = true;
marginLeft = mleft;
marginTop = mtop;
@@ -122,13 +120,12 @@ public class ItemsGrid
public void shiftPage(int shift)
{
if (perPage == 0) {
numPages = 0;
page = 0;
return;
}
numPages = (int) Math.ceil((float) realItems.size() / (float) perPage);
final int numPages = getNumPages();
final int oldPage = page;
page += shift;
if (page >= numPages) {
@@ -140,8 +137,15 @@ public class ItemsGrid
}
page = Math.max(0, Math.min(page, numPages - 1));
if(shift != 0)
refreshBuffer = true;
if (page != oldPage) {
onGridChanged();
}
}
protected void onGridChanged()
{
refreshBuffer = true;
}
public void refresh(GuiContainer gui)
@@ -150,17 +154,22 @@ public class ItemsGrid
shiftPage(0);
}
private void updateGuiOverlapSlots(GuiContainer gui)
protected void updateGuiOverlapSlots(GuiContainer gui)
{
boolean[] oldSlotMap = invalidSlotMap;
final boolean[] oldSlotMap = invalidSlotMap;
final int oldRows = rows;
final int oldColumns = columns;
invalidSlotMap = new boolean[rows * columns];
perPage = columns * rows;
checkGuiOverlap(gui, 0, columns - 2, 1);
checkGuiOverlap(gui, columns - 1, 1, -1);
if(NEIClientConfig.shouldCacheItemRendering() && !Arrays.equals(oldSlotMap, invalidSlotMap)) {
refreshBuffer = true;
if (oldRows != rows || oldColumns != columns || !Arrays.equals(oldSlotMap, invalidSlotMap)) {
onGridChanged();
}
}
private void checkGuiOverlap(GuiContainer gui, int start, int end, int dir)
@@ -194,29 +203,45 @@ public class ItemsGrid
return new Rectangle4i(marginLeft + paddingLeft + column * SLOT_SIZE, marginTop + row * SLOT_SIZE, SLOT_SIZE, SLOT_SIZE);
}
public boolean isInvalidSlot(int idx)
public boolean isInvalidSlot(int index)
{
return invalidSlotMap[idx];
return invalidSlotMap[index];
}
protected List<Integer> getMask()
{
List<Integer> mask = new ArrayList<>();
int idx = page * perPage;
for (int i = 0; i < rows * columns && idx < size(); i++) {
mask.add(isInvalidSlot(i)? null: idx++);
}
return mask;
}
private void drawSlotOutlines(int mousex, int mousey)
{
ItemPanelSlot focused = getSlotMouseOver(mousex, mousey);
int idx = page * perPage;
for (int i = 0; i < rows * columns && idx < size(); i++) {
if(!invalidSlotMap[i]) {
drawSlotOutline(focused, idx, getSlotRect(i));
idx++;
final List<Integer> mask = getMask();
for (int i = 0; i < mask.size(); i++) {
if (mask.get(i) != null) {
drawSlotOutline(focused, mask.get(i), getSlotRect(i));
}
}
}
protected void drawSlotOutline(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect)
{
if (focused != null && focused.slotIndex == slotIdx) {
drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555);//highlight
}
}
protected void drawSlotOutline(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {
if(focused != null && focused.slotIndex == slotIdx)
drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555);//highlight
}
private void blitExistingBuffer() {
private void blitExistingBuffer()
{
Minecraft minecraft = Minecraft.getMinecraft();
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -241,7 +266,7 @@ public class ItemsGrid
}
boolean shouldCache = NEIClientConfig.shouldCacheItemRendering() && !PresetsWidget.inEditMode();
if(shouldCache) {
if (shouldCache) {
Minecraft minecraft = Minecraft.getMinecraft();
if (framebuffer == null) {
framebuffer = new Framebuffer(minecraft.displayWidth, minecraft.displayHeight, true);
@@ -269,11 +294,10 @@ public class ItemsGrid
GuiContainerManager.enableMatrixStackLogging();
int idx = page * perPage;
for (int i = 0; i < rows * columns && idx < size(); i++) {
if (!invalidSlotMap[i]) {
drawItem(getSlotRect(i), idx);
idx ++;
final List<Integer> mask = getMask();
for (int i = 0; i < mask.size(); i++) {
if (mask.get(i) != null) {
drawItem(getSlotRect(i), mask.get(i));
}
}
@@ -300,19 +324,21 @@ public class ItemsGrid
final int overRow = (int) ((mousey - marginTop) / SLOT_SIZE);
final int overColumn = (int) ((mousex - marginLeft - paddingLeft) / SLOT_SIZE);
final int slt = columns * overRow + overColumn;
int idx = page * perPage + slt;
if (overRow >= rows || overColumn >= columns) {
return null;
}
for (int i = 0; i < slt; i++) {
if (invalidSlotMap[i]) {
idx--;
}
final List<Integer> mask = getMask();
if (mask.size() > slt && mask.get(slt) != null) {
final int idx = mask.get(slt);
final ItemStack stack = getItem(idx).copy();
return new ItemPanelSlot(idx, stack);
}
return idx < size()? new ItemPanelSlot(idx, realItems.get(idx)): null;
return null;
}
public boolean contains(int px, int py)
@@ -326,7 +352,7 @@ public class ItemsGrid
final int c = (int) ((px - marginLeft - paddingLeft) / SLOT_SIZE);
final int slt = columns * r + c;
return r >= rows || c >= columns || !invalidSlotMap[slt];
return r >= rows || c >= columns || !isInvalidSlot(slt);
}
}
@@ -358,12 +358,14 @@ public abstract class PanelWidget extends Widget
return grid.getSlotMouseOver(mousex, mousey);
}
public int getPage() {
return grid.page + 1;
public int getPage()
{
return grid.getPage();
}
public int getNumPages() {
return grid.numPages;
public int getNumPages()
{
return grid.getNumPages();
}
@Override
@@ -1,6 +1,5 @@
package codechicken.nei.recipe;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemPanels;
import codechicken.nei.LayoutManager;
import codechicken.nei.NEIClientConfig;
@@ -11,7 +10,6 @@ import codechicken.nei.guihook.IContainerInputHandler;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import java.awt.*;
import java.util.List;
public class RecipeItemInputHandler implements IContainerInputHandler {
@@ -401,13 +401,13 @@ minechem.nei.SynthesisNEIRecipeHandler,minechem:tile.chemicalSynthesizer,,minech
exter.fodc.nei.ODCRecipeHandler,fodc:oreConverter,,fodc,TRUE,,,,,,
exter.fodc.nei.ODCRecipeHandler,fodc:oreConvTable,,fodc,TRUE,,,,,,
exter.fodc.nei.ODCRecipeHandler,fodc:oreAutoconverter,,fodc,TRUE,,,,,,
cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerCharger,ThermalExpansion:Machine:10,,ThermalExpansion,TRUE,,,,,,this and below are not working well
cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerCharger,ThermalExpansion:Machine:10,,ThermalExpansion,TRUE,,,,,,"this and below are not working well, ReSiever mod fixes it"
cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerCrucible,ThermalExpansion:Machine:4,,ThermalExpansion,TRUE,,,,,,
crafting,ThermalExpansion:Workbench:1,,ThermalExpansion,TRUE,,,,,,
crafting,ThermalExpansion:Workbench:2,,ThermalExpansion,TRUE,,,,,,
crafting,ThermalExpansion:Workbench:3,,ThermalExpansion,TRUE,,,,,,
crafting,ThermalExpansion:Workbench:4,,ThermalExpansion,TRUE,,,,,,
smelting,ThermalExpansion:Machine:0,,ThermalExpansion,TRUE,,,,,,
cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerFurnace,ThermalExpansion:Machine,,ThermalExpansion,TRUE,,,,,,
cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerInsolator,ThermalExpansion:Machine:11,,ThermalExpansion,TRUE,,,,,,
cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerPulverizer,ThermalExpansion:Machine:1,,ThermalExpansion,TRUE,,,,,,
cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerSawmill,ThermalExpansion:Machine:2,,ThermalExpansion,TRUE,,,,,,
@@ -456,7 +456,7 @@ mekanism.client.nei.PurificationChamberRecipeHandler,Mekanism:MachineBlock:7,"{r
mekanism.client.nei.RotaryCondensentratorRecipeHandler,Mekanism:MachineBlock2:0,,Mekanism,TRUE,,,,,,
mekanism.client.nei.SolarNeutronRecipeHandler,Mekanism:MachineBlock3:1,,Mekanism,TRUE,,,,,,
mekanism.client.nei.ThermalEvaporationRecipeHandler,Mekanism:BasicBlock:14,,Mekanism,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_wood,,exnihilo,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_wood,,exnihilo,TRUE,,,,,,"Ex Nihilo does not really work out of the box, use the ReSiever mod to fix this"
exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_stone,,exnihilo,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_iron,,exnihilo,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_gold,,exnihilo,TRUE,,,,,,
@@ -507,6 +507,8 @@ crafting,LogisticsPipes:logisticsSolidBlock:3,,LogisticsPipes,TRUE,,,,,,
crafting,LogisticsPipes:logisticsSolidBlock:4,,LogisticsPipes,TRUE,,,,,,
crafting,DraconicEvolution:draconiumChest,,DraconicEvolution,TRUE,,-50,,,,
smelting,DraconicEvolution:draconiumChest,,DraconicEvolution,TRUE,,-50,,,,
smelting,ProjRed|Expansion:projectred.expansion.machine1,,ProjRed|Expansion,TRUE,,,,,,
crafting,ProjRed|Expansion:projectred.expansion.machine2:10,,ProjRed|Expansion,TRUE,,,,,,
crafting,ProjRed|Expansion:projectred.expansion.machine2:11,,ProjRed|Expansion,TRUE,,,,,,
crafting,TwilightForest:tile.TFUncraftingTable,,TwilightForest,TRUE,,,,,,
com.teammetallurgy.metallurgy.nei.CrusherHandler,Metallurgy:crusher,,Metallurgy,TRUE,,,,,,
@@ -1252,4 +1254,64 @@ gg.recipe.naquadah_fuel_refine_factory,gregtech:gt.blockmachines:16999,,GoodGene
gt.recipe.researchStation,gregtech:gt.blockmachines:15331,,tectech,TRUE,,,,,,
gt.recipe.em_scanner,tectech:item.em.definitionScanStorage,,tectech,TRUE,,,,,,no recipe? don't know
gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:13101,,kekztech,TRUE,,,,,,
gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:13102,,kekztech,TRUE,,,,,,
gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:13102,,kekztech,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerSieve,exastris:sieve_automatic,,exastris,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,exastris:hammer_thaumium,,exastris,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,exastris:hammer_rf,,exastris,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,exastris:manaHammer,,exastris,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerSieve,excompressum:manaSieve,,excompressum,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerSieve,excompressum:autoSieve,,excompressum,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,excompressum:chickenStick,,excompressum,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,excompressum:oreSmasher,,excompressum,TRUE,,,,,,
exnihilo.compatibility.nei.RecipeHandlerHammer,excompressum:autoHammer,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:1,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:2,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:3,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:4,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:5,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:autoHeavySieve,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerWood,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerStone,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerGold,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerIron,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerDiamond,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:autoCompressedHammer,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:1,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:2,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:3,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:4,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:5,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel_stone,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exastris:barrel_thaumium,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:1,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:2,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:3,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:4,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:5,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel_stone,,excompressum,TRUE,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exastris:barrel_thaumium,,excompressum,TRUE,,,,,,
crafting,rftools:crafterBlock1,,rftools,TRUE,,,,,,
crafting,rftools:crafterBlock2,,rftools,TRUE,,,,,,
crafting,rftools:crafterBlock3,,rftools,TRUE,,,,,,
crafting,StevesCarts:CartModule:87,,StevesCarts,TRUE,,,,,,
crafting,StevesCarts:CartModule:92,,StevesCarts,TRUE,,,,,,
smelting,StevesCarts:CartModule:91,,StevesCarts,TRUE,,,,,,
smelting,StevesCarts:CartModule:93,,StevesCarts,TRUE,,,,,,
com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapedRecipeHandler,thaumicenergistics:thaumicenergistics.block.arcane.assembler,,thaumicenergistics,TRUE,,,,,,
com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapelessRecipeHandler,thaumicenergistics:thaumicenergistics.block.arcane.assembler,,thaumicenergistics,TRUE,,,,,,
ru.timeconqueror.tcneiadditions.nei.arcaneworkbench.ArcaneCraftingShapedHandler,thaumicenergistics:thaumicenergistics.block.arcane.assembler,,thaumicenergistics,TRUE,,,,,,
com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapedRecipeHandler,thaumicenergistics:part.base:5,,thaumicenergistics,TRUE,,,,,,
com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapelessRecipeHandler,thaumicenergistics:part.base:6,,thaumicenergistics,TRUE,,,,,,
ru.timeconqueror.tcneiadditions.nei.arcaneworkbench.ArcaneCraftingShapedHandler,thaumicenergistics:part.base:7,,thaumicenergistics,TRUE,,,,,,
crafting,BiblioCraft:BiblioWorkbench,,BiblioCraft,TRUE,,,,,,
crafting,BiblioCraft:BiblioWorkbench:1,,BiblioCraft,TRUE,,,,,,
crafting,BiblioCraft:BiblioWorkbench:2,,BiblioCraft,TRUE,,,,,,
crafting,BiblioCraft:BiblioWorkbench:3,,BiblioCraft,TRUE,,,,,,
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,,,,,,
1 handler itemName nbtInfo modId modRequired excludedModId priority minVersion maxVersion forceClassName itemNotes
401 exter.fodc.nei.ODCRecipeHandler fodc:oreConverter fodc TRUE
402 exter.fodc.nei.ODCRecipeHandler fodc:oreConvTable fodc TRUE
403 exter.fodc.nei.ODCRecipeHandler fodc:oreAutoconverter fodc TRUE
404 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerCharger ThermalExpansion:Machine:10 ThermalExpansion TRUE this and below are not working well this and below are not working well, ReSiever mod fixes it
405 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerCrucible ThermalExpansion:Machine:4 ThermalExpansion TRUE
406 crafting ThermalExpansion:Workbench:1 ThermalExpansion TRUE
407 crafting ThermalExpansion:Workbench:2 ThermalExpansion TRUE
408 crafting ThermalExpansion:Workbench:3 ThermalExpansion TRUE
409 crafting ThermalExpansion:Workbench:4 ThermalExpansion TRUE
410 smelting cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerFurnace ThermalExpansion:Machine:0 ThermalExpansion:Machine ThermalExpansion TRUE
411 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerInsolator ThermalExpansion:Machine:11 ThermalExpansion TRUE
412 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerPulverizer ThermalExpansion:Machine:1 ThermalExpansion TRUE
413 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerSawmill ThermalExpansion:Machine:2 ThermalExpansion TRUE
456 mekanism.client.nei.RotaryCondensentratorRecipeHandler Mekanism:MachineBlock2:0 Mekanism TRUE
457 mekanism.client.nei.SolarNeutronRecipeHandler Mekanism:MachineBlock3:1 Mekanism TRUE
458 mekanism.client.nei.ThermalEvaporationRecipeHandler Mekanism:BasicBlock:14 Mekanism TRUE
459 exnihilo.compatibility.nei.RecipeHandlerHammer exnihilo:hammer_wood exnihilo TRUE Ex Nihilo does not really work out of the box, use the ReSiever mod to fix this
460 exnihilo.compatibility.nei.RecipeHandlerHammer exnihilo:hammer_stone exnihilo TRUE
461 exnihilo.compatibility.nei.RecipeHandlerHammer exnihilo:hammer_iron exnihilo TRUE
462 exnihilo.compatibility.nei.RecipeHandlerHammer exnihilo:hammer_gold exnihilo TRUE
507 crafting LogisticsPipes:logisticsSolidBlock:4 LogisticsPipes TRUE
508 crafting DraconicEvolution:draconiumChest DraconicEvolution TRUE -50
509 smelting DraconicEvolution:draconiumChest DraconicEvolution TRUE -50
510 smelting ProjRed|Expansion:projectred.expansion.machine1 ProjRed|Expansion TRUE
511 crafting ProjRed|Expansion:projectred.expansion.machine2:10 ProjRed|Expansion TRUE
512 crafting ProjRed|Expansion:projectred.expansion.machine2:11 ProjRed|Expansion TRUE
513 crafting TwilightForest:tile.TFUncraftingTable TwilightForest TRUE
514 com.teammetallurgy.metallurgy.nei.CrusherHandler Metallurgy:crusher Metallurgy TRUE
1254 gt.recipe.researchStation gregtech:gt.blockmachines:15331 tectech TRUE
1255 gt.recipe.em_scanner tectech:item.em.definitionScanStorage tectech TRUE no recipe? don't know
1256 gt.recipe.gasturbinefuel gregtech:gt.blockmachines:13101 kekztech TRUE
1257 gt.recipe.gasturbinefuel gregtech:gt.blockmachines:13102 kekztech TRUE
1258 exnihilo.compatibility.nei.RecipeHandlerSieve exastris:sieve_automatic exastris TRUE
1259 exnihilo.compatibility.nei.RecipeHandlerHammer exastris:hammer_thaumium exastris TRUE
1260 exnihilo.compatibility.nei.RecipeHandlerHammer exastris:hammer_rf exastris TRUE
1261 exnihilo.compatibility.nei.RecipeHandlerHammer exastris:manaHammer exastris TRUE
1262 exnihilo.compatibility.nei.RecipeHandlerSieve excompressum:manaSieve excompressum TRUE
1263 exnihilo.compatibility.nei.RecipeHandlerSieve excompressum:autoSieve excompressum TRUE
1264 exnihilo.compatibility.nei.RecipeHandlerHammer excompressum:chickenStick excompressum TRUE
1265 exnihilo.compatibility.nei.RecipeHandlerHammer excompressum:oreSmasher excompressum TRUE
1266 exnihilo.compatibility.nei.RecipeHandlerHammer excompressum:autoHammer excompressum TRUE
1267 net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve excompressum:heavySieve excompressum TRUE
1268 net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve excompressum:heavySieve:1 excompressum TRUE
1269 net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve excompressum:heavySieve:2 excompressum TRUE
1270 net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve excompressum:heavySieve:3 excompressum TRUE
1271 net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve excompressum:heavySieve:4 excompressum TRUE
1272 net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve excompressum:heavySieve:5 excompressum TRUE
1273 net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve excompressum:autoHeavySieve excompressum TRUE
1274 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer excompressum:compressedHammerWood excompressum TRUE
1275 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer excompressum:compressedHammerStone excompressum TRUE
1276 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer excompressum:compressedHammerGold excompressum TRUE
1277 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer excompressum:compressedHammerIron excompressum TRUE
1278 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer excompressum:compressedHammerDiamond excompressum TRUE
1279 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer excompressum:autoCompressedHammer excompressum TRUE
1280 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting exnihilo:barrel excompressum TRUE
1281 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting exnihilo:barrel:1 excompressum TRUE
1282 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting exnihilo:barrel:2 excompressum TRUE
1283 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting exnihilo:barrel:3 excompressum TRUE
1284 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting exnihilo:barrel:4 excompressum TRUE
1285 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting exnihilo:barrel:5 excompressum TRUE
1286 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting exnihilo:barrel_stone excompressum TRUE
1287 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting exastris:barrel_thaumium excompressum TRUE
1288 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess exnihilo:barrel excompressum TRUE
1289 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess exnihilo:barrel:1 excompressum TRUE
1290 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess exnihilo:barrel:2 excompressum TRUE
1291 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess exnihilo:barrel:3 excompressum TRUE
1292 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess exnihilo:barrel:4 excompressum TRUE
1293 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess exnihilo:barrel:5 excompressum TRUE
1294 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess exnihilo:barrel_stone excompressum TRUE
1295 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess exastris:barrel_thaumium excompressum TRUE
1296 crafting rftools:crafterBlock1 rftools TRUE
1297 crafting rftools:crafterBlock2 rftools TRUE
1298 crafting rftools:crafterBlock3 rftools TRUE
1299 crafting StevesCarts:CartModule:87 StevesCarts TRUE
1300 crafting StevesCarts:CartModule:92 StevesCarts TRUE
1301 smelting StevesCarts:CartModule:91 StevesCarts TRUE
1302 smelting StevesCarts:CartModule:93 StevesCarts TRUE
1303 com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapedRecipeHandler thaumicenergistics:thaumicenergistics.block.arcane.assembler thaumicenergistics TRUE
1304 com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapelessRecipeHandler thaumicenergistics:thaumicenergistics.block.arcane.assembler thaumicenergistics TRUE
1305 ru.timeconqueror.tcneiadditions.nei.arcaneworkbench.ArcaneCraftingShapedHandler thaumicenergistics:thaumicenergistics.block.arcane.assembler thaumicenergistics TRUE
1306 com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapedRecipeHandler thaumicenergistics:part.base:5 thaumicenergistics TRUE
1307 com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapelessRecipeHandler thaumicenergistics:part.base:6 thaumicenergistics TRUE
1308 ru.timeconqueror.tcneiadditions.nei.arcaneworkbench.ArcaneCraftingShapedHandler thaumicenergistics:part.base:7 thaumicenergistics TRUE
1309 crafting BiblioCraft:BiblioWorkbench BiblioCraft TRUE
1310 crafting BiblioCraft:BiblioWorkbench:1 BiblioCraft TRUE
1311 crafting BiblioCraft:BiblioWorkbench:2 BiblioCraft TRUE
1312 crafting BiblioCraft:BiblioWorkbench:3 BiblioCraft TRUE
1313 crafting BiblioCraft:BiblioWorkbench:4 BiblioCraft TRUE
1314 crafting BiblioCraft:BiblioWorkbench:5 BiblioCraft TRUE
1315 crafting BiblioCraft:BiblioWorkbench:6 BiblioCraft TRUE
1316 crafting ComputerCraft:CC-TurtleExpanded {leftUpgrade:2} ComputerCraft TRUE
1317 crafting ComputerCraft:CC-TurtleAdvanced {leftUpgrade:2} ComputerCraft TRUE
@@ -494,4 +494,10 @@ nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft,NuclearCraft:nuclearW
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,,,,,,
connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,Campfire Backport,campfirebackport:campfire_base,,campfirebackport,TRUE,,,65,166,5,,,,,,
connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,Campfire Backport,campfirebackport:campfire_base,,campfirebackport,TRUE,,,65,166,5,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,Ex Compressum,excompressum:heavySieve,,excompressum,TRUE,,,130,166,5,,,,,,
net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,Ex Compressum,exnihilo:barrel,,excompressum,TRUE,,,58,166,10,,,,,,
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,,,,,,
1 handler modName itemName nbtInfo modId modRequired excludedModId yShift handlerHeight handlerWidth maxRecipesPerPage imageResource imageX imageY imageWidth imageHeight itemNotes
494 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker EtFuturum Requiem etfuturum:lit_smoker etfuturum TRUE 65 166 5
495 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace EtFuturum Requiem etfuturum:lit_blast_furnace etfuturum TRUE 65 166 5
496 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler Campfire Backport campfirebackport:campfire campfirebackport TRUE 65 166 5
497 connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler Campfire Backport campfirebackport:campfire_base campfirebackport TRUE 65 166 5
498 net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve Ex Compressum excompressum:heavySieve excompressum TRUE 130 166 5
499 net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess Ex Compressum exnihilo:barrel excompressum TRUE 58 166 10
500 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting Ex Compressum exnihilo:barrel excompressum TRUE 130 166 5
501 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer Ex Compressum excompressum:compressedHammerIron excompressum TRUE 58 166 10
502 com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropMutationHandler AgriCraft AgriCraft:cropsItem AgriCraft TRUE 85 166 5
503 com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler AgriCraft minecraft:farmland AgriCraft TRUE 85 166 5
@@ -8,6 +8,7 @@ nei.key.ctrl.mac=CMD
nei.bookmark.toggle=Bookmarks
nei.bookmark.toggle.tip=Toggle visibility of the Bookmark Panel
nei.bookmark.viewmode.toggle.tip=Toggle Bookmark View Mode
nei.enchant=Enchant
nei.enchant.level=Level
+12 -2
View File
@@ -66,6 +66,7 @@ nei.chat.rain.on=开启雨雪
nei.chat.rain.off=关闭雨雪
nei.chat.time=白天 %d. %d:00
nei.chat.give.noitem=没有此物品
nei.chat.recipe.error=加载合成表过程中出现错误.请查看log文件获取详细信息.
nei.options=NEI选项
nei.options.back=后退
@@ -77,7 +78,7 @@ nei.options.wbutton.tip.0=使用全局设置
nei.options.wbutton.tip.1=覆写全局设置
nei.options.keys=按键绑定
nei.options.keys.showenchant=显示附魔
nei.options.keys.showenchant=显示附魔值
nei.options.keys.gui=物品栏
nei.options.keys.gui.recipe=查看合成
nei.options.keys.gui.usage=查看用途
@@ -94,6 +95,7 @@ nei.options.keys.gui.prev_machine=上一机器
nei.options.keys.gui.search=跳转到搜索框
nei.options.keys.gui.bookmark=添加书签
nei.options.keys.gui.hide_bookmarks=显示/隐藏书签页
nei.options.keys.gui.overlay=提取合成表至合成栏/工作台
nei.options.keys.world=世界
nei.options.keys.world.chunkoverlay=区块(chunks)边界显示
nei.options.keys.world.moboverlay=刷怪区域显示
@@ -132,6 +134,9 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=禁用
nei.options.inventory.useNBTInBookmarks=在书签中启用NBT
nei.options.inventory.useNBTInBookmarks.true=是
nei.options.inventory.useNBTInBookmarks.false=否
nei.options.inventory.showRecipeMarker=在书签栏显示合成产物标记
nei.options.inventory.showRecipeMarker.true=是
nei.options.inventory.showRecipeMarker.false=否
nei.options.inventory.creative_tab_style=创造模式/JEI标签页
nei.options.inventory.creative_tab_style.true=创造模式
nei.options.inventory.creative_tab_style.false=JEI
@@ -174,6 +179,9 @@ nei.options.inventory.disableMouseScrollTransfer.false=关闭
nei.options.inventory.invertMouseScrollTransfer=反转鼠标滚轮方向
nei.options.inventory.invertMouseScrollTransfer.true=开启
nei.options.inventory.invertMouseScrollTransfer.false=关闭
nei.options.inventory.cacheItemRendering=缓存物品渲染
nei.options.inventory.cacheItemRendering.true=开启
nei.options.inventory.cacheItemRendering.false=关闭
nei.options.command=指令
nei.options.command.creative=游戏模式
@@ -192,6 +200,8 @@ nei.options.world.highlight_tips.hide=隐藏
nei.options.world.highlight_tips.show=显示
nei.options.world.highlight_tips.sample=样本
nei.options.world.panels=面板布局
nei.options.tools=工具
nei.options.tools.handler_load_from_config=从Config加载handler(加工所使用的机器类别)
nei.options.tools.handler_load_from_config.true=Config
@@ -293,4 +303,4 @@ nei.presets.whitelist.tooltip=白名单
nei.presets.textfield.tooltip.1=Enter - 保存
nei.presets.textfield.tooltip.2=Esc - 取消
nei.presets.label.tooltip=双击编辑
nei.presets.label.selected=%s 预设
nei.presets.label.selected=%s 预设