1 files changed, 61 insertions, 23 deletions

diff --git a/libraries/launcher/org/prismlauncher/utils/Parameters.java b/libraries/launcher/org/prismlauncher/utils/Parameters.java
index 98a40c28..6365753e 100644
--- a/libraries/launcher/org/prismlauncher/utils/Parameters.java
+++ b/libraries/launcher/org/prismlauncher/utils/Parameters.java
@@ -1,46 +1,84 @@
+// SPDX-License-Identifier: GPL-3.0-only
 /*
- * Copyright 2012-2021 MultiMC Contributors
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 icelimetea <fr3shtea@outlook.com>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (C) 2022 solonovamax <solonovamax@12oclockpoint.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Linking this library statically or dynamically with other modules is
+ *  making a combined work based on this library. Thus, the terms and
+ *  conditions of the GNU General Public License cover the whole
+ *  combination.
+ *
+ *  As a special exception, the copyright holders of this library give
+ *  you permission to link this library with independent modules to
+ *  produce an executable, regardless of the license terms of these
+ *  independent modules, and to copy and distribute the resulting
+ *  executable under terms of your choice, provided that you also meet,
+ *  for each linked independent module, the terms and conditions of the
+ *  license of that module. An independent module is a module which is
+ *  not derived from or based on this library. If you modify this
+ *  library, you may extend this exception to your version of the
+ *  library, but you are not obliged to do so. If you do not wish to do
+ *  so, delete this exception statement from your version.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 package org.prismlauncher.utils;
 
-import org.prismlauncher.exception.ParameterNotFoundException;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.prismlauncher.exception.ParameterNotFoundException;
+
 public final class Parameters {
 
-    private final Map<String, List<String>> paramsMap = new HashMap<>();
+    private final Map<String, List<String>> map = new HashMap<>();
 
     public void add(String key, String value) {
-        List<String> params = paramsMap.get(key);
+        List<String> params = map.get(key);
 
         if (params == null) {
             params = new ArrayList<>();
 
-            paramsMap.put(key, params);
+            map.put(key, params);
         }
 
         params.add(value);
     }
 
-    public List<String> all(String key) throws ParameterNotFoundException {
-        List<String> params = paramsMap.get(key);
+    public List<String> getList(String key) throws ParameterNotFoundException {
+        List<String> params = map.get(key);
 
         if (params == null)
             throw new ParameterNotFoundException(key);
@@ -48,8 +86,8 @@ public final class Parameters {
         return params;
     }
 
-    public List<String> allSafe(String key, List<String> def) {
-        List<String> params = paramsMap.get(key);
+    public List<String> getList(String key, List<String> def) {
+        List<String> params = map.get(key);
 
         if (params == null || params.isEmpty())
             return def;
@@ -57,8 +95,8 @@ public final class Parameters {
         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);
@@ -66,8 +104,8 @@ public final class Parameters {
         return list.get(0);
     }
 
-    public String firstSafe(String key, String def) {
-        List<String> params = paramsMap.get(key);
+    public String getString(String key, String def) {
+        List<String> params = map.get(key);
 
         if (params == null || params.isEmpty())
             return def;