2 files changed, 32 insertions, 27 deletions
diff --git a/libraries/launcher/org/prismlauncher/utils/Utils.java b/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java
index 79f5367b..7607d731 100644
--- a/libraries/launcher/org/prismlauncher/utils/Utils.java
+++ b/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java
@@ -16,34 +16,39 @@
 
 package org.prismlauncher.utils;
 
+
 import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-public final class Utils {
-
-    private Utils() {}
 
+public final class LegacyUtils {
+    
+    private LegacyUtils() {
+    }
+    
     /**
      * Finds a field that looks like a Minecraft base folder in a supplied class
      *
      * @param clazz the class to scan
      */
     public static Field getMinecraftGameDirField(Class<?> clazz) {
-        for (Field f : clazz.getDeclaredFields()) {
+        // Field we're looking for is always
+        // private static File obfuscatedName = null;
+        for (Field field : clazz.getDeclaredFields()) {
             // Has to be File
-            if (f.getType() != File.class)
+            if (field.getType() != File.class)
                 continue;
-
+            
             // And Private Static.
-            if (!Modifier.isStatic(f.getModifiers()) || !Modifier.isPrivate(f.getModifiers()))
+            if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isPrivate(field.getModifiers()))
                 continue;
-
-            return f;
+            
+            return field;
         }
-
+        
         return null;
     }
-
+    
 }
 
diff --git a/libraries/launcher/org/prismlauncher/utils/Parameters.java b/libraries/launcher/org/prismlauncher/utils/Parameters.java
index dcaba18d..00b0701f 100644
--- a/libraries/launcher/org/prismlauncher/utils/Parameters.java
+++ b/libraries/launcher/org/prismlauncher/utils/Parameters.java
@@ -39,39 +39,39 @@ public final class Parameters {
         params.add(value);
     }
 
-    public List<String> all(String key) throws ParameterNotFoundException {
+    public List<String> getList(String key) throws ParameterNotFoundException {
         List<String> params = map.get(key);
-
+    
         if (params == null)
             throw new ParameterNotFoundException(key);
-
+    
         return params;
     }
-
-    public List<String> allSafe(String key, List<String> def) {
+    
+    public List<String> getList(String key, List<String> def) {
         List<String> params = map.get(key);
-
+        
         if (params == null || params.isEmpty())
             return def;
-
+        
         return params;
     }
-
-    public String first(String key) throws ParameterNotFoundException {
-        List<String> list = all(key);
-
+    
+    public String getString(String key) throws ParameterNotFoundException {
+        List<String> list = getList(key);
+        
         if (list.isEmpty())
             throw new ParameterNotFoundException(key);
-
+        
         return list.get(0);
     }
-
-    public String firstSafe(String key, String def) {
+    
+    public String getString(String key, String def) {
         List<String> params = map.get(key);
-
+        
         if (params == null || params.isEmpty())
             return def;
-
+        
         return params.get(0);
     }