Remove the need for LegacyUtils

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

2 files changed, 25 insertions, 92 deletions

diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java
index ed12cdf6..c249c714 100644
--- a/libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java
+++ b/libraries/launcher/org/prismlauncher/launcher/impl/LegacyLauncher.java
@@ -56,7 +56,6 @@
 package org.prismlauncher.launcher.impl;
 
 import org.prismlauncher.applet.LegacyFrame;
-import org.prismlauncher.utils.LegacyUtils;
 import org.prismlauncher.utils.Parameters;
 
 import java.applet.Applet;
@@ -65,6 +64,7 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
@@ -101,7 +101,7 @@ public final class LegacyLauncher extends AbstractLauncher {
     @Override
     public void launch() throws Throwable {
         Class<?> main = loadMain();
-        Field gameDirField = LegacyUtils.getMinecraftGameDirField(main);
+        Field gameDirField = getMinecraftGameDirField(main);
 
         if (gameDirField == null) {
             LOGGER.warning("Could not find Mineraft path field.");
@@ -143,4 +143,27 @@ public final class LegacyLauncher extends AbstractLauncher {
         invokeMain(main);
     }
 
+    /**
+     * Finds a field that looks like a Minecraft base folder in a supplied class
+     * @param clazz the class to scan
+     * @return The found field.
+     */
+    private static Field getMinecraftGameDirField(Class<?> clazz) {
+        // Field we're looking for is always
+        // private static File obfuscatedName = null;
+        for (Field field : clazz.getDeclaredFields()) {
+            // Has to be File
+            if (field.getType() != File.class)
+                continue;
+
+            // And Private Static.
+            if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isPrivate(field.getModifiers()))
+                continue;
+
+            return field;
+        }
+
+        return null;
+    }
+
 }
diff --git a/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java b/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java
deleted file mode 100644
index 8e7cbb74..00000000
--- a/libraries/launcher/org/prismlauncher/utils/LegacyUtils.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 icelimetea <fr3shtea@outlook.com>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
- *  Copyright (C) 2022 solonovamax <solonovamax@12oclockpoint.com>
- *
- *  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.
- *
- *  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.
- *
- *  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 java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-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) {
-        // Field we're looking for is always
-        // private static File obfuscatedName = null;
-        for (Field field : clazz.getDeclaredFields()) {
-            // Has to be File
-            if (field.getType() != File.class)
-                continue;
-
-            // And Private Static.
-            if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isPrivate(field.getModifiers()))
-                continue;
-
-            return field;
-        }
-
-        return null;
-    }
-
-}
-