Check to make sure there is an ID on all lines

SS111 · Oct 26, 2013 · ddcc528 · ddcc528
1 parent c880cd1
commit ddcc528
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/com/github/ss111/ConfigHelper.java b/src/com/github/ss111/ConfigHelper.java
@@ -82,7 +82,7 @@ public static void populateMaps(String path) {
 							itemComingUp = true;
 							continue;
 
-						} else if (configLine.contains("I:") && blockComingUp == true) {
+						} else if (configLine.contains("I:") && blockComingUp == true && configLine.matches(".*\\d.*")) {
 
 							String[] blockNameSplit = configLine.split("=");
 
@@ -93,7 +93,7 @@ public static void populateMaps(String path) {
 							blockIDs.put(Integer.valueOf(configLine.substring(configLine.lastIndexOf("=") + 1)), blockAndConfig);
 							continue;
 
-						} else if (configLine.contains("I:") && itemComingUp == true) {
+						} else if (configLine.contains("I:") && itemComingUp == true && configLine.matches(".*\\d.*")) {
 
 							String[] itemNameSplit = configLine.split("=");
 
@@ -180,7 +180,7 @@ public static void populateMaps(String path) {
 
 									itemComingUp = true;
 
-								} else if (configLine.contains("I:") && blockComingUp == true) {
+								} else if (configLine.contains("I:") && blockComingUp == true && configLine.matches(".*\\d.*")) {
 
 									String[] blockNameSplit = configLine.split("=");
 
@@ -191,7 +191,7 @@ public static void populateMaps(String path) {
 									blockIDs.put(Integer.valueOf(configLine.substring(configLine.lastIndexOf("=") + 1)), blockAndConfig);
 									continue;
 
-								} else if (configLine.contains("I:") && itemComingUp == true) {
+								} else if (configLine.contains("I:") && itemComingUp == true && configLine.matches(".*\\d.*")) {
 
 									String[] itemNameSplit = configLine.split("=");
 
@@ -203,7 +203,7 @@ public static void populateMaps(String path) {
 									continue;
 
 									//& or &&?
-								} else if (configLine.contains("I:") & blockComingUp == false & itemComingUp == false) {
+								} else if (configLine.contains("I:") & configLine.matches(".*\\d.*") & blockComingUp == false & itemComingUp == false) {
 
 									if (configLine.contains("block") || configLine.contains("Block") || configLine.contains("BLOCK") || configLine.contains("item") || configLine.contains("Item") || configLine.contains("ITEM")) {
 
@@ -278,7 +278,7 @@ public static void populateMaps(String path) {
 
 											itemComingUp = true;
 
-										} else if (configLine.contains("I:") && blockComingUp == true) {
+										} else if (configLine.contains("I:") && blockComingUp == true && configLine.matches(".*\\d.*")) {
 
 											String[] blockNameSplit = configLine.split("=");
 
@@ -289,7 +289,7 @@ public static void populateMaps(String path) {
 											blockIDs.put(Integer.valueOf(configLine.substring(configLine.lastIndexOf("=") + 1)), blockAndConfig);
 											continue;
 
-										} else if (configLine.contains("I:") && itemComingUp == true) {
+										} else if (configLine.contains("I:") && itemComingUp == true && configLine.matches(".*\\d.*")) {
 
 											String[] itemNameSplit = configLine.split("=");
 
@@ -301,7 +301,7 @@ public static void populateMaps(String path) {
 											continue;
 
 											//& or &&?
-										} else if (configLine.contains("I:") & blockComingUp == false & itemComingUp == false) {
+										} else if (configLine.contains("I:") & configLine.matches(".*\\d.*") & blockComingUp == false & itemComingUp == false) {
 
 											if (configLine.contains("block") || configLine.contains("Block") || configLine.contains("BLOCK") || configLine.contains("item") || configLine.contains("Item") || configLine.contains("ITEM")) {