diff --git a/src/main/java/codechicken/nei/ItemList.java b/src/main/java/codechicken/nei/ItemList.java index a7fb1d6e..eee223d7 100644 --- a/src/main/java/codechicken/nei/ItemList.java +++ b/src/main/java/codechicken/nei/ItemList.java @@ -37,6 +37,11 @@ public class ItemList { private static final HashSet erroredItems = new HashSet<>(); private static final HashSet 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 items = new LinkedList<>(); LinkedList permutations = new LinkedList<>(); @@ -218,6 +224,8 @@ public class ItemList { for (ItemsLoadedCallback callback : loadCallbacks) callback.itemsLoaded(); updateFilter.restart(); + + loadFinished = true; } }; diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java index fcea168e..57fa0aed 100644 --- a/src/main/java/codechicken/nei/ItemPanel.java +++ b/src/main/java/codechicken/nei/ItemPanel.java @@ -73,6 +73,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() { diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java index 5d2a5f1e..5b38e59a 100644 --- a/src/main/java/codechicken/nei/ItemsGrid.java +++ b/src/main/java/codechicken/nei/ItemsGrid.java @@ -41,6 +41,8 @@ public class ItemsGrid { protected boolean[] invalidSlotMap; + protected Label messageLabel = new Label(getMessageOnEmpty(), true); + @Nullable private Framebuffer framebuffer = null; @@ -104,6 +106,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,6 +310,12 @@ 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)); } @@ -345,4 +356,8 @@ public class ItemsGrid { return r >= rows || c >= columns || !isInvalidSlot(slt); } + + public String getMessageOnEmpty() { + return null; + } } diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java index b4fb8746..0e15e74c 100644 --- a/src/main/java/codechicken/nei/LayoutManager.java +++ b/src/main/java/codechicken/nei/LayoutManager.java @@ -112,6 +112,12 @@ public class LayoutManager public static HashMap 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; /** diff --git a/src/main/java/codechicken/nei/PanelWidget.java b/src/main/java/codechicken/nei/PanelWidget.java index 73f5d02b..a705c781 100644 --- a/src/main/java/codechicken/nei/PanelWidget.java +++ b/src/main/java/codechicken/nei/PanelWidget.java @@ -160,6 +160,7 @@ public abstract class PanelWidget extends Widget { LayoutManager.addWidget(pagePrev); LayoutManager.addWidget(pageNext); LayoutManager.addWidget(pageLabel); + grid.setVisible(); } } diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 08e09d2f..59076556 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -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