diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index 0932aeca..50078c81 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -54,15 +54,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class ClientHandler { - private static String[] defaultHandlerOrdering = { - "# Each line in this file should either be a comment (starts with '#') or an ordering.", - "# Ordering lines are ,.", - "# Handlers will be sorted in order of number ascending, so smaller numbers first.", - "# Any handlers that are missing from this file will be assigned to 0.", "# Negative numbers are fine.", - "# If you delete this file, it will be regenerated with all registered handler IDs.", }; private static ClientHandler instance; - - private ArrayList SMPmagneticItems = new ArrayList<>(); + private final ArrayList SMPmagneticItems = new ArrayList<>(); private World lastworld; private GuiScreen lastGui; @@ -234,17 +227,22 @@ public class ClientHandler { } public static void postInit() { - loadHandlerOrdering(); GuiContainerManager.registerReloadResourceListener(); } public static void loadHandlerOrdering() { final String COMMA_DELIMITER = ","; + final String[] defaultHandlerOrdering = { + "# Each line in this file should either be a comment (starts with '#') or an ordering.", + "# Ordering lines are ,.", + "# Handlers will be sorted in order of number ascending, so smaller numbers first.", + "# Any handlers that are missing from this file will be assigned to 0.", "# Negative numbers are fine.", + "# If you delete this file, it will be regenerated with all registered handler IDs.", }; loadSettingsFile("handlerordering.csv", (file, writer) -> { List toWrite = Lists.newArrayList(defaultHandlerOrdering); GuiRecipeTab.handlerMap.keySet().stream().sorted() - .forEach(handlerId -> toWrite.add(String.format("%s,0", handlerId))); + .forEach(handlerId -> toWrite.add(String.format("%s" + COMMA_DELIMITER + "0", handlerId))); try { IOUtils.writeLines(toWrite, "\n", writer); } catch (IOException e) {} diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java index fae67670..81724b29 100644 --- a/src/main/java/codechicken/nei/NEIModContainer.java +++ b/src/main/java/codechicken/nei/NEIModContainer.java @@ -128,6 +128,7 @@ public class NEIModContainer extends DummyModContainer { if (CommonUtils.isClient()) { GuiRecipeTab.loadHandlerInfo(); ClientHandler.loadPluginsList(); + ClientHandler.loadHandlerOrdering(); } }