diff --git a/src/main/java/codechicken/nei/ItemList.java b/src/main/java/codechicken/nei/ItemList.java index 01cfa424..8a2c3168 100644 --- a/src/main/java/codechicken/nei/ItemList.java +++ b/src/main/java/codechicken/nei/ItemList.java @@ -185,13 +185,13 @@ public class ItemList @SuppressWarnings("unchecked") public void execute() { // System.out.println("Executing NEI Item Loading"); - ThreadOperationTimer timer = getTimer(500); + ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout()); LinkedList items = new LinkedList<>(); LinkedList permutations = new LinkedList<>(); ListMultimap itemMap = ArrayListMultimap.create(); - timer.setLimit(500); + timer.setLimit(NEIClientConfig.getItemLoadingTimeout()); for (Item item : (Iterable) Item.itemRegistry) { if (interrupted()) return; diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 66a70548..4ac4be5b 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -168,6 +168,8 @@ public class NEIClientConfig { return isMouseScrollTransferEnabled(); } }); + + tag.getTag("itemLoadingTimeout").getIntValue(500); tag.getTag("command.creative").setDefaultValue("/gamemode {0} {1}"); API.addOption(new OptionTextField("command.creative")); @@ -446,6 +448,10 @@ public class NEIClientConfig { int i = getIntSetting("inventory.itemIDs"); return i == 2 || (i == 1 && isEnabled() && !isHidden()); } + + public static int getItemLoadingTimeout() { + return getIntSetting("itemLoadingTimeout"); + } public static void toggleBooleanSetting(String setting) { ConfigTag tag = getSetting(setting);