From cfcdb92c8e37d7abca596a0c41085d66c1f331bf Mon Sep 17 00:00:00 2001 From: Kevin Ji Date: Wed, 28 Aug 2013 10:18:28 -0700 Subject: [PATCH] Very minor style fixes Replacing tabs with spaces consistently, making brace styles consistent, etc. --- fml/common/cpw/mods/fml/common/Loader.java | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/fml/common/cpw/mods/fml/common/Loader.java b/fml/common/cpw/mods/fml/common/Loader.java index 6d063be29..17fad9262 100644 --- a/fml/common/cpw/mods/fml/common/Loader.java +++ b/fml/common/cpw/mods/fml/common/Loader.java @@ -149,7 +149,7 @@ public class Loader private File canonicalModsDir; private LoadController modController; private MinecraftDummyContainer minecraft; - private MCPDummyContainer mcp; + private MCPDummyContainer mcp; private static File minecraftDir; private static List injectedContainers; @@ -368,7 +368,6 @@ public class Loader { return o1.getModId().compareTo(o2.getModId()); } - } private void identifyDuplicates(List mods) @@ -394,7 +393,7 @@ public class Loader } if (!dupes.isEmpty()) { - throw new DuplicateModsFoundException(dupes); + throw new DuplicateModsFoundException(dupes); } } @@ -596,7 +595,7 @@ public class Loader List branding = FMLCommonHandler.instance().getBrandings(); Joiner.on(' ').skipNulls().appendTo(ret, branding.subList(1, branding.size())); - if (modController!=null) + if (modController != null) { modController.printModStates(ret); } @@ -620,7 +619,7 @@ public class Loader return; } - boolean parseFailure=false; + boolean parseFailure = false; for (String dep : DEPENDENCYSPLITTER.split(dependencyString)) { @@ -628,7 +627,7 @@ public class Loader // Need two parts to the string if (depparts.size() != 2) { - parseFailure=true; + parseFailure = true; continue; } String instruction = depparts.get(0); @@ -636,7 +635,7 @@ public class Loader boolean targetIsAll = target.startsWith("*"); // Cannot have an "all" relationship with anything except pure * - if (targetIsAll && target.length()>1) + if (targetIsAll && target.length() > 1) { parseFailure = true; continue; @@ -652,13 +651,13 @@ public class Loader } else { - parseFailure=true; + parseFailure = true; continue; } } // You cannot have a versioned dependency on everything - if (targetIsAll && target.indexOf('@')>-1) + if (targetIsAll && target.indexOf('@') > -1) { parseFailure = true; continue; @@ -675,7 +674,7 @@ public class Loader } else { - parseFailure=true; + parseFailure = true; } } @@ -704,7 +703,7 @@ public class Loader modController.distributeStateMessage(LoaderState.AVAILABLE); // Dump the custom registry data map, if necessary GameData.dumpRegistry(minecraftDir); - FMLLog.info("Forge Mod Loader has successfully loaded %d mod%s", mods.size(), mods.size()==1 ? "" : "s"); + FMLLog.info("Forge Mod Loader has successfully loaded %d mod%s", mods.size(), mods.size() == 1 ? "" : "s"); } public ICrashCallable getCallableCrashInformation() @@ -791,13 +790,15 @@ public class Loader return minecraft; } - public boolean hasReachedState(LoaderState state) { - return modController != null ? modController.hasReachedState(state) : false; - } + public boolean hasReachedState(LoaderState state) + { + return modController != null ? modController.hasReachedState(state) : false; + } - public String getMCPVersionString() { - return String.format("MCP v%s", mcpversion); - } + public String getMCPVersionString() + { + return String.format("MCP v%s", mcpversion); + } public void serverStopped() {