Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use some object oriented programming
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
- Loading branch information
1 parent
deb42d1
commit 41a1926
Showing
12 changed files
with
304 additions
and
224 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
libraries/launcher/org/prismlauncher/impl/AbstractLauncher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* Copyright 2012-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.impl; | ||
|
|
||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.lang.invoke.MethodType; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.prismlauncher.Launcher; | ||
| import org.prismlauncher.exception.ParseException; | ||
| import org.prismlauncher.utils.Parameters; | ||
|
|
||
| public abstract class AbstractLauncher implements Launcher { | ||
|
|
||
| private static final int DEFAULT_WINDOW_WIDTH = 854; | ||
| private static final int DEFAULT_WINDOW_HEIGHT = 480; | ||
|
|
||
| // parameters, separated from ParamBucket | ||
| protected final List<String> mcParams; | ||
| private final String mainClass; | ||
|
|
||
| // secondary parameters | ||
| protected final int width; | ||
| protected final int height; | ||
| protected final boolean maximize; | ||
|
|
||
| protected final String serverAddress, serverPort; | ||
|
|
||
| protected final ClassLoader classLoader; | ||
|
|
||
| public AbstractLauncher(Parameters params) { | ||
| classLoader = ClassLoader.getSystemClassLoader(); | ||
|
|
||
| mcParams = params.allSafe("param", new ArrayList<String>()); | ||
| mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft"); | ||
|
|
||
| serverAddress = params.firstSafe("serverAddress", null); | ||
| serverPort = params.firstSafe("serverPort", null); | ||
|
|
||
| String windowParams = params.firstSafe("windowParams", null); | ||
|
|
||
| if ("max".equals(windowParams) || windowParams == null) { | ||
| maximize = windowParams != null; | ||
|
|
||
| width = DEFAULT_WINDOW_WIDTH; | ||
| height = DEFAULT_WINDOW_HEIGHT; | ||
| } else { | ||
| maximize = false; | ||
|
|
||
| int byIndex = windowParams.indexOf('x'); | ||
|
|
||
| if (byIndex != -1) { | ||
| try { | ||
| width = Integer.parseInt(windowParams.substring(0, byIndex)); | ||
| height = Integer.parseInt(windowParams.substring(byIndex + 1)); | ||
| return; | ||
| } catch(NumberFormatException pass) { | ||
| } | ||
| } | ||
|
|
||
| throw new ParseException("Invalid window size parameter value: " + windowParams); | ||
| } | ||
| } | ||
|
|
||
| protected Class<?> loadMain() throws ClassNotFoundException { | ||
| return classLoader.loadClass(mainClass); | ||
| } | ||
|
|
||
| protected void loadAndInvokeMain() throws Throwable, ClassNotFoundException { | ||
| invokeMain(loadMain()); | ||
| } | ||
|
|
||
| protected void invokeMain(Class<?> mainClass) throws Throwable { | ||
| MethodHandle method = MethodHandles.lookup().findStatic(mainClass, "main", MethodType.methodType(void.class, String[].class)); | ||
|
|
||
| method.invokeExact(mcParams.toArray(new String[0])); | ||
| } | ||
|
|
||
| } |
104 changes: 104 additions & 0 deletions
104
libraries/launcher/org/prismlauncher/impl/LegacyLauncher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* Copyright 2012-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.impl; | ||
|
|
||
| import java.applet.Applet; | ||
| import java.io.File; | ||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.lang.invoke.MethodType; | ||
| import java.lang.reflect.Field; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| import org.prismlauncher.applet.LegacyFrame; | ||
| import org.prismlauncher.utils.Parameters; | ||
| import org.prismlauncher.utils.Utils; | ||
|
|
||
| @SuppressWarnings("removal") | ||
| public final class LegacyLauncher extends AbstractLauncher { | ||
|
|
||
| private static final Logger LOGGER = Logger.getLogger("LegacyLauncher"); | ||
|
|
||
| private final String user, session; | ||
| private final String title; | ||
| private final String appletClass; | ||
|
|
||
| private final boolean noApplet; | ||
| private final String cwd; | ||
|
|
||
| public LegacyLauncher(Parameters params) { | ||
| super(params); | ||
|
|
||
| user = params.first("userName"); | ||
| session = params.first("sessionId"); | ||
| title = params.firstSafe("windowTitle", "Minecraft"); | ||
| appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet"); | ||
|
|
||
| List<String> traits = params.allSafe("traits", Collections.<String>emptyList()); | ||
| noApplet = traits.contains("noapplet"); | ||
|
|
||
| cwd = System.getProperty("user.dir"); | ||
| } | ||
|
|
||
| @Override | ||
| public void launch() throws Throwable { | ||
| Class<?> main = loadMain(); | ||
| Field gameDirField = Utils.getMinecraftGameDirField(main); | ||
|
|
||
| if (gameDirField == null) { | ||
| LOGGER.warning("Could not find Mineraft path field."); | ||
| } else { | ||
| gameDirField.setAccessible(true); | ||
| gameDirField.set(null, new File(cwd)); | ||
| } | ||
|
|
||
| if (!noApplet) { | ||
| LOGGER.info("Launching with applet wrapper..."); | ||
|
|
||
| try { | ||
| Class<?> appletClass = classLoader.loadClass(this.appletClass); | ||
|
|
||
| MethodHandle constructor = MethodHandles.lookup().findConstructor(appletClass, MethodType.methodType(void.class)); | ||
| Applet applet = (Applet) constructor.invoke(); | ||
|
|
||
| LegacyFrame window = new LegacyFrame(title, applet); | ||
|
|
||
| window.start( | ||
| user, | ||
| session, | ||
| width, | ||
| height, | ||
| maximize, | ||
| serverAddress, | ||
| serverPort, | ||
| mcParams.contains("--demo") | ||
| ); | ||
|
|
||
| return; | ||
| } catch (Throwable e) { | ||
| LOGGER.log(Level.SEVERE, "Applet wrapper failed:", e); | ||
|
|
||
| LOGGER.warning("Falling back to using main class."); | ||
| } | ||
| } | ||
|
|
||
| invokeMain(main); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.