Fixes #1

SS111 · Oct 5, 2013 · 4210aa2 · 4210aa2
1 parent 5b8a61b
commit 4210aa2
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 34 deletions.
diff --git a/src/com/github/ss111/IdDumpHelper.java b/src/com/github/ss111/IdDumpHelper.java
@@ -9,6 +9,8 @@
 
 import javax.swing.JOptionPane;
 
+import org.apache.commons.io.FilenameUtils;
+
 /**
  * IdDumpHelper is used to help with NEI ID dumps. It's main functionality is the ability to parse NEI ID dumps and extract both the unused block IDs and the unused item IDs.
  * @author SS111
@@ -30,60 +32,109 @@ public static void populateUnusedIDs(String path) {
 
 		File idMap = new File(path);
 
-		try {
-
-			dumpReader = new BufferedReader(new FileReader(idMap));
-
-		} catch (FileNotFoundException e) {
-
-			e.printStackTrace();
-		}
+		if (FilenameUtils.getExtension(path).equals("txt")) {
 
-		try {
+			try {
+
+				dumpReader = new BufferedReader(new FileReader(idMap));
+
+			} catch (FileNotFoundException e) {
+
+				e.printStackTrace();
+			}
 
-			while ((dumpLine = dumpReader.readLine()) != null) {
+			try {
 
-				if (dumpLine == null) {
-
-					continue;
+				while ((dumpLine = dumpReader.readLine()) != null) {
 
-				} else if (dumpLine.contains("Name:")) {
-
-					continue;
-
-				} else if (dumpLine.contains("Block")) {
+					if (dumpLine == null) {
+
+						continue;
+
+					} else if (dumpLine.contains("Name:")) {
+
+						continue;
 
-						if (Integer.valueOf(dumpLine.replace("Block. ", "").replace("Unused ID: ", "")) <= 421) {
+					} else if (dumpLine.contains("Block")) {
+
+							if (Integer.valueOf(dumpLine.replace("Block. ", "").replace("Unused ID: ", "")) <= 422) {
+
+								continue;
+
+							} else {
+
+								unusedBlockIDs.add(Integer.valueOf(dumpLine.replace("Block. ", "").replace("Unused ID: ", "")));
+								continue;
+							}
+
+					} else {
+
+						if (Integer.valueOf(dumpLine.replace("Item. ", "").replace("Unused ID: ", "")) <= 422) {
 
 							continue;
 
 						} else {
 
-							unusedBlockIDs.add(Integer.valueOf(dumpLine.replace("Block. ", "").replace("Unused ID: ", "")));
+							unusedItemIDs.add(Integer.valueOf(dumpLine.replace("Item. ", "").replace("Unused ID: ", "")));
 							continue;
 						}
-
-				} else {
+					}
+				}
+
+				dumpReader.close();
+
+			} catch (IOException e) {
+
+				e.printStackTrace();
+			}
+		}
+
+		else {
+
+			try {
+
+				dumpReader = new BufferedReader(new FileReader(idMap));
+
+			} catch (FileNotFoundException e) {
+
+				e.printStackTrace();
+			}
+
+
+			try {
+
+				while ((dumpLine = dumpReader.readLine()) != null) {
 
-					if (Integer.valueOf(dumpLine.replace("Item. ", "").replace("Unused ID: ", "")) <= 421) {
+					if (dumpLine == null) {
 
 						continue;
 
-					} else {
+					} else if (dumpLine.contains("null,null") && dumpLine != "0,null,null,null,null") {
 
-						unusedItemIDs.add(Integer.valueOf(dumpLine.replace("Item. ", "").replace("Unused ID: ", "")));
-						continue;
+						if (Integer.valueOf(dumpLine.split(",")[0]) <= 422)
+						{
+							continue;
+
+						} else {
+
+							if (Integer.valueOf(dumpLine.split(",")[0]) <= 4095) {
+
+								unusedBlockIDs.add(Integer.valueOf(dumpLine.split(",")[0]));
+
+							} else {
+
+								unusedItemIDs.add(Integer.valueOf(dumpLine.split(",")[0]));
+							}
+						}
 					}
 				}
+
+			} catch (IOException e) {
+
+				e.printStackTrace();
 			}
-
-			dumpReader.close();
-
-		} catch (IOException e) {
-
-			e.printStackTrace();
 		}
-	}
+	}	
 
 	/**
 	 * Returns an {@link ArrayList} of unused block IDs.

diff --git a/src/com/github/ss111/WindowMain.java b/src/com/github/ss111/WindowMain.java
@@ -365,7 +365,7 @@ public void actionPerformed(ActionEvent e) {
 
 				JFileChooser dumpChooser = new JFileChooser();
 
-				FileNameExtensionFilter filter = new FileNameExtensionFilter("NEI ID Dump", "txt");
+				FileNameExtensionFilter filter = new FileNameExtensionFilter("NEI ID Dump", "txt", "csv");
 
 				dumpChooser.setFileFilter(filter);
 				dumpChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);