Merge branch 'PrismLauncher:develop' into develop

12 files changed, 31 insertions, 31 deletions

diff --git a/libraries/README.md b/libraries/README.md
index 9a26dd69..dc38477b 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -173,7 +173,7 @@ Available either under LGPL version 2.1 or later.
 
 ## systeminfo
 
-A PolyMC-specific library for probing system information.
+A Prism Launcher-specific library for probing system information.
 
 Apache 2.0
 
@@ -183,4 +183,4 @@ A TOML language parser. Used by Forge 1.14+ to store mod metadata.
 
 See [github repo](https://github.com/marzer/tomlplusplus).
 
-Licenced under the MIT licence.
\ No newline at end of file
+Licenced under the MIT licence.
diff --git a/libraries/katabasis/README.md b/libraries/katabasis/README.md
index 621446e1..fe6dd4ac 100644
--- a/libraries/katabasis/README.md
+++ b/libraries/katabasis/README.md
@@ -10,7 +10,7 @@ Notes to contributors:
 
 * Please follow the coding style of the existing source, where reasonable
 * Code contributions are released under Simplified BSD License, as specified in LICENSE. Do not contribute if this license does not suit your code
-* If you are interested in working on this, come to the PolyMC Discord server and talk first
+* If you are interested in working on this, come to the Prism Launcher Discord server and talk first
 
 ## Installation
 
diff --git a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
index c4dfa5b7..df25414f 100644
--- a/libraries/launcher/CMakeLists.txt
+++ b/libraries/launcher/CMakeLists.txt
@@ -3,19 +3,19 @@ project(launcher Java)
 find_package(Java 1.7 REQUIRED COMPONENTS Development)
 
 include(UseJava)
-set(CMAKE_JAVA_JAR_ENTRY_POINT org.polymc.EntryPoint)
+set(CMAKE_JAVA_JAR_ENTRY_POINT org.prismlauncher.EntryPoint)
 set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
 
 set(SRC
-    org/polymc/EntryPoint.java
-    org/polymc/Launcher.java
-    org/polymc/LauncherFactory.java
-    org/polymc/impl/OneSixLauncher.java
-    org/polymc/applet/LegacyFrame.java
-    org/polymc/exception/ParameterNotFoundException.java
-    org/polymc/exception/ParseException.java
-    org/polymc/utils/Parameters.java
-    org/polymc/utils/Utils.java
+    org/prismlauncher/EntryPoint.java
+    org/prismlauncher/Launcher.java
+    org/prismlauncher/LauncherFactory.java
+    org/prismlauncher/impl/OneSixLauncher.java
+    org/prismlauncher/applet/LegacyFrame.java
+    org/prismlauncher/exception/ParameterNotFoundException.java
+    org/prismlauncher/exception/ParseException.java
+    org/prismlauncher/utils/Parameters.java
+    org/prismlauncher/utils/Utils.java
     net/minecraft/Launcher.java
 )
 add_jar(NewLaunch ${SRC})
diff --git a/libraries/launcher/org/polymc/EntryPoint.java b/libraries/launcher/org/prismlauncher/EntryPoint.java
index 20f418eb..9144e1f1 100644
--- a/libraries/launcher/org/polymc/EntryPoint.java
+++ b/libraries/launcher/org/prismlauncher/EntryPoint.java
@@ -50,10 +50,10 @@
  *      limitations under the License.
  */
 
-package org.polymc;
+package org.prismlauncher;
 
-import org.polymc.exception.ParseException;
-import org.polymc.utils.Parameters;
+import org.prismlauncher.exception.ParseException;
+import org.prismlauncher.utils.Parameters;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/libraries/launcher/org/polymc/Launcher.java b/libraries/launcher/org/prismlauncher/Launcher.java
index 5bff123e..7f25717b 100644
--- a/libraries/launcher/org/polymc/Launcher.java
+++ b/libraries/launcher/org/prismlauncher/Launcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.polymc;
+package org.prismlauncher;
 
 public interface Launcher {
 
diff --git a/libraries/launcher/org/polymc/LauncherFactory.java b/libraries/launcher/org/prismlauncher/LauncherFactory.java
index 86862929..98f2bbba 100644
--- a/libraries/launcher/org/polymc/LauncherFactory.java
+++ b/libraries/launcher/org/prismlauncher/LauncherFactory.java
@@ -33,10 +33,10 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.polymc;
+package org.prismlauncher;
 
-import org.polymc.impl.OneSixLauncher;
-import org.polymc.utils.Parameters;
+import org.prismlauncher.impl.OneSixLauncher;
+import org.prismlauncher.utils.Parameters;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/libraries/launcher/org/polymc/applet/LegacyFrame.java b/libraries/launcher/org/prismlauncher/applet/LegacyFrame.java
index 7ae56e60..4413efa8 100644
--- a/libraries/launcher/org/polymc/applet/LegacyFrame.java
+++ b/libraries/launcher/org/prismlauncher/applet/LegacyFrame.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.polymc.applet;
+package org.prismlauncher.applet;
 
 import net.minecraft.Launcher;
 
diff --git a/libraries/launcher/org/polymc/exception/ParameterNotFoundException.java b/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
index 2044814e..641e0c99 100644
--- a/libraries/launcher/org/polymc/exception/ParameterNotFoundException.java
+++ b/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.polymc.exception;
+package org.prismlauncher.exception;
 
 public final class ParameterNotFoundException extends IllegalArgumentException {
 
diff --git a/libraries/launcher/org/polymc/exception/ParseException.java b/libraries/launcher/org/prismlauncher/exception/ParseException.java
index 2f2f8294..51d25a62 100644
--- a/libraries/launcher/org/polymc/exception/ParseException.java
+++ b/libraries/launcher/org/prismlauncher/exception/ParseException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.polymc.exception;
+package org.prismlauncher.exception;
 
 public final class ParseException extends IllegalArgumentException {
 
diff --git a/libraries/launcher/org/polymc/impl/OneSixLauncher.java b/libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java
index d43101eb..d6443826 100644
--- a/libraries/launcher/org/polymc/impl/OneSixLauncher.java
+++ b/libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.polymc.impl;
+package org.prismlauncher.impl;
 
-import org.polymc.Launcher;
-import org.polymc.applet.LegacyFrame;
-import org.polymc.utils.Parameters;
-import org.polymc.utils.Utils;
+import org.prismlauncher.Launcher;
+import org.prismlauncher.applet.LegacyFrame;
+import org.prismlauncher.utils.Parameters;
+import org.prismlauncher.utils.Utils;
 
 import java.applet.Applet;
 import java.io.File;
diff --git a/libraries/launcher/org/polymc/utils/Parameters.java b/libraries/launcher/org/prismlauncher/utils/Parameters.java
index 864d3cd2..98a40c28 100644
--- a/libraries/launcher/org/polymc/utils/Parameters.java
+++ b/libraries/launcher/org/prismlauncher/utils/Parameters.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.polymc.utils;
+package org.prismlauncher.utils;
 
-import org.polymc.exception.ParameterNotFoundException;
+import org.prismlauncher.exception.ParameterNotFoundException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/libraries/launcher/org/polymc/utils/Utils.java b/libraries/launcher/org/prismlauncher/utils/Utils.java
index 12d6e1aa..ae9a4de2 100644
--- a/libraries/launcher/org/polymc/utils/Utils.java
+++ b/libraries/launcher/org/prismlauncher/utils/Utils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.polymc.utils;
+package org.prismlauncher.utils;
 
 import java.io.File;
 import java.lang.reflect.Field;