tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into development

Browse source
This commit is contained in:
Aidan C. Brady 2015-02-19 16:35:09 -05:00
commit ce29270d21
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/mekanism/common/BoxBlacklistParser.java
View file

@ -60,20 +60,22 @@ public final class BoxBlacklistParser
{ {
line++; line++;
if(readingLine.startsWith("#")) if(readingLine.startsWith("#") || readingLine.trim().isEmpty())
{ {
continue; continue;
} }
String[] split = readingLine.split(":"); String[] split = readingLine.split(":");
if(split.length != 2 || !isInteger(split[1])) if(split.length < 2 || split.length > 3 || !isInteger(split[split.length-1]))
{ {
Mekanism.logger.error("BoxBlacklist.txt: Couldn't parse blacklist data on line " + line); Mekanism.logger.error("BoxBlacklist.txt: Couldn't parse blacklist data on line " + line);
continue; continue;
} }
Block block = Block.getBlockFromName(split[0].trim()); String blockName = (split.length == 2) ? split[0].trim() : split[0].trim() + ":" + split[1].trim();
Block block = Block.getBlockFromName(blockName);
if(block == null) if(block == null)
{ {
@ -81,7 +83,7 @@ public final class BoxBlacklistParser
continue; continue;
} }
MekanismAPI.addBoxBlacklist(block, Integer.parseInt(split[1])); MekanismAPI.addBoxBlacklist(block, Integer.parseInt(split[split.length-1]));
entries++; entries++;
} }