diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 61662e7a..bc47ddb0 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -38,6 +38,7 @@ dependencies { pack project(':LauncherAuthlib') + bundle project(':LauncherGUI') //compile group: 'org.openjfx', name: 'javafx-controls', version: '12', classifier: 'win' //compile group: 'org.openjfx', name: 'javafx-graphics', version: '12', classifier: 'win' //compile group: 'org.openjfx', name: 'javafx-base', version: '12', classifier: 'win' diff --git a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java index c839dfd0..88439550 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java +++ b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java @@ -10,6 +10,7 @@ import pro.gravit.launcher.guard.LauncherGuardManager; import pro.gravit.launcher.gui.JSRuntimeProvider; import pro.gravit.launcher.gui.RuntimeProvider; +import pro.gravit.launcher.gui.GuiRuntimeProvider; import pro.gravit.launcher.managers.ClientGsonManager; import pro.gravit.launcher.managers.ConsoleManager; import pro.gravit.launcher.request.Request; @@ -71,9 +72,18 @@ public void start(String... args) throws Throwable { Launcher.modulesManager = new ClientModuleManager(this); LauncherConfig.getAutogenConfig().initModules(); Launcher.modulesManager.preInitModules(); - if (runtimeProvider == null) runtimeProvider = new JSRuntimeProvider(); + // INIT GUI + try + { + Class.forName( "javafx.application.Application" ); + if (runtimeProvider == null) runtimeProvider = new JSRuntimeProvider(); + } + catch( ClassNotFoundException e ) { + if (runtimeProvider == null) runtimeProvider = new GuiRuntimeProvider(); + } runtimeProvider.init(false); runtimeProvider.preLoad(); + // INIT GUI if (Request.service == null) { String address = Launcher.getConfig().address; LogHelper.debug("Start async connection to %s", address); diff --git a/Launcher/src/main/java/pro/gravit/launcher/gui/GuiRuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/gui/GuiRuntimeProvider.java new file mode 100644 index 00000000..9da0d42f --- /dev/null +++ b/Launcher/src/main/java/pro/gravit/launcher/gui/GuiRuntimeProvider.java @@ -0,0 +1,90 @@ +package pro.gravit.launcher.gui; + +import java.io.BufferedReader; +import java.io.IOException; +import java.net.URL; +import java.util.Map; + +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherConfig; +import pro.gravit.launcher.NewLauncherSettings; +import pro.gravit.launcher.client.ClientLauncher; +import pro.gravit.launcher.client.DirBridge; +import pro.gravit.launcher.client.FunctionalBridge; +import pro.gravit.launcher.client.ServerPinger; +import pro.gravit.launcher.client.UserSettings; +import pro.gravit.launcher.hasher.FileNameMatcher; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.hasher.HashedFile; +import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.profiles.optional.OptionalFile; +import pro.gravit.launcher.request.PingRequest; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.request.RequestType; +import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.request.auth.CheckServerRequest; +import pro.gravit.launcher.request.auth.GetAvailabilityAuthRequest; +import pro.gravit.launcher.request.auth.JoinServerRequest; +import pro.gravit.launcher.request.auth.SetProfileRequest; +import pro.gravit.launcher.request.update.LauncherRequest; +import pro.gravit.launcher.request.update.ProfilesRequest; +import pro.gravit.launcher.request.update.UpdateRequest; +import pro.gravit.launcher.request.uuid.BatchProfileByUsernameRequest; +import pro.gravit.launcher.request.uuid.ProfileByUUIDRequest; +import pro.gravit.launcher.request.uuid.ProfileByUsernameRequest; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.signed.SignedBytesHolder; +import pro.gravit.launcher.serialize.signed.SignedObjectHolder; +import pro.gravit.launcher.serialize.stream.EnumSerializer; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launchergui.api.GuiEngine; +import pro.gravit.launchergui.Application; +import pro.gravit.utils.HTTPRequest; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.EnvHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.VerifyHelper; + +public class GuiRuntimeProvider implements RuntimeProvider { + + private final GuiEngine engine = CommonHelper.newGuiEngine(); + private boolean isPreLoaded = false; + + @LauncherAPI + public void loadConfig(String get) { + engine.config(engine, get); + } + + @Override + public void run(String[] args) throws NoSuchMethodException, IOException { + preLoad(); + LogHelper.info("Invoking start() function"); + Launcher.modulesManager.postInitModules(); + engine.start((String[]) args); + Launcher.modulesManager.finishModules(); + } + + @Override + public void preLoad() throws IOException { + if (!isPreLoaded) { + loadConfig("API"); + loadConfig("CONFIG"); + isPreLoaded = true; + } + } + + @Override + public void init(boolean clientInstance) { + loadConfig("INIT"); + } +} diff --git a/LauncherCore/build.gradle b/LauncherCore/build.gradle index d143c15a..b7e58e13 100644 --- a/LauncherCore/build.gradle +++ b/LauncherCore/build.gradle @@ -6,5 +6,6 @@ compileOnly 'org.jline:jline:3.11.0' compileOnly 'org.jline:jline-reader:3.11.0' compileOnly 'org.jline:jline-terminal:3.11.0' + compileOnly project(':LauncherGUI') compile 'com.google.code.gson:gson:2.8.5' } diff --git a/LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java index a7dc68a1..ffc28804 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java @@ -21,7 +21,7 @@ import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; - +import pro.gravit.launchergui.api.GuiEngine; import pro.gravit.launcher.LauncherAPI; import pro.gravit.utils.command.CommandException; @@ -65,6 +65,11 @@ public static String multiReplace(Pattern[] pattern, String from, String replace public static ScriptEngine newScriptEngine() { return nashornFactory.getScriptEngine(); } + + @LauncherAPI + public static GuiEngine newGuiEngine() { + return GuiEngine.getGuiEngine(); + } @LauncherAPI public static Thread newThread(String name, boolean daemon, Runnable runnable) { diff --git a/LauncherGUI/build.gradle b/LauncherGUI/build.gradle new file mode 100644 index 00000000..215081f1 --- /dev/null +++ b/LauncherGUI/build.gradle @@ -0,0 +1,12 @@ +String mainClassName = "pro.gravit.launchergui.Application" + +sourceCompatibility = '1.8' +targetCompatibility = '1.8' +jar { + classifier = 'clean' + manifest.attributes("Main-Class": mainClassName, + "Can-Redefine-Classes": "true", + "Can-Retransform-Classes": "true", + "Can-Set-Native-Method-Prefix": "true", + "Multi-Release-Jar": "true") +} \ No newline at end of file diff --git a/LauncherGUI/gradle/wrapper/gradle-wrapper.jar b/LauncherGUI/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..5c2d1cf0 Binary files /dev/null and b/LauncherGUI/gradle/wrapper/gradle-wrapper.jar differ diff --git a/LauncherGUI/gradle/wrapper/gradle-wrapper.properties b/LauncherGUI/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..ee69dd68 --- /dev/null +++ b/LauncherGUI/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/LauncherGUI/gradlew b/LauncherGUI/gradlew new file mode 100644 index 00000000..b0d6d0ab --- /dev/null +++ b/LauncherGUI/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/LauncherGUI/gradlew.bat b/LauncherGUI/gradlew.bat new file mode 100644 index 00000000..9991c503 --- /dev/null +++ b/LauncherGUI/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/LauncherGUI/src/main/java/pro/gravit/launchergui/Application.java b/LauncherGUI/src/main/java/pro/gravit/launchergui/Application.java new file mode 100644 index 00000000..dde695b0 --- /dev/null +++ b/LauncherGUI/src/main/java/pro/gravit/launchergui/Application.java @@ -0,0 +1,32 @@ +package pro.gravit.launchergui; + +//import java.util.Map; +import java.awt.Dimension; +import javax.swing.JFrame; +import javax.swing.JLabel; +import pro.gravit.launchergui.helper.initGui; +public class Application { + public static void createGUI(boolean build) { + if (build) { + initGui.init(); + } else { + JFrame.setDefaultLookAndFeelDecorated(true); + JFrame frame = new JFrame("Имя лаунчера не задано(Лаунчер не собран)"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + JLabel label = new JLabel("Отсутствует конфиг, прошу соберите лаунчер."); + frame.getContentPane().add(label); + frame.setPreferredSize(new Dimension(500,100)); + frame.pack(); + frame.setVisible(true); + } + } + public static void main(String... args) { + javax.swing.SwingUtilities.invokeLater( + new Runnable() { + public void run() { + createGUI(false); + } + } + ); + } +} \ No newline at end of file diff --git a/LauncherGUI/src/main/java/pro/gravit/launchergui/api/GuiEngine.java b/LauncherGUI/src/main/java/pro/gravit/launchergui/api/GuiEngine.java new file mode 100644 index 00000000..69986559 --- /dev/null +++ b/LauncherGUI/src/main/java/pro/gravit/launchergui/api/GuiEngine.java @@ -0,0 +1,32 @@ +package pro.gravit.launchergui.api; + +import java.util.HashMap; +import java.util.Map; +import pro.gravit.launchergui.Application; +public class GuiEngine { + private Map Configs = new HashMap(); + public void start(String[] args) { + Application.createGUI(true); + } + public void config(GuiEngine engine,String config) { + try { + System.out.println("Настройка "+config+" Загружена"); + Class c = Class.forName("pro.gravit.launchergui.config."+config); + Object configclass = c.newInstance(); + GuiEngineConfig runclass = (GuiEngineConfig) configclass; + runclass.main(engine); + + } +catch (Exception e){ + System.out.println("Ошибка при загрузке настройки "+config); +} + } + public void configset(String path, String value) { + + Configs.put(path, value); + } + public static GuiEngine getGuiEngine() { + GuiEngine var = new GuiEngine(); + return var; + } + } \ No newline at end of file diff --git a/LauncherGUI/src/main/java/pro/gravit/launchergui/api/GuiEngineConfig.java b/LauncherGUI/src/main/java/pro/gravit/launchergui/api/GuiEngineConfig.java new file mode 100644 index 00000000..0cd58b39 --- /dev/null +++ b/LauncherGUI/src/main/java/pro/gravit/launchergui/api/GuiEngineConfig.java @@ -0,0 +1,4 @@ +package pro.gravit.launchergui.api; +public class GuiEngineConfig { + void main(GuiEngine engine) {} +} \ No newline at end of file diff --git a/LauncherGUI/src/main/java/pro/gravit/launchergui/api/loading.java b/LauncherGUI/src/main/java/pro/gravit/launchergui/api/loading.java new file mode 100644 index 00000000..13c2d8d3 --- /dev/null +++ b/LauncherGUI/src/main/java/pro/gravit/launchergui/api/loading.java @@ -0,0 +1,13 @@ +package pro.gravit.launchergui.api; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +public class loading { + public static void load(String frame) { + try { + Class.forName("pro.gravit.launchergui.gui."+frame); +} +catch (Exception e){ + System.out.println("Ошибка при загрузке "+frame); +} + } +} \ No newline at end of file diff --git a/LauncherGUI/src/main/java/pro/gravit/launchergui/config/INIT.java b/LauncherGUI/src/main/java/pro/gravit/launchergui/config/INIT.java new file mode 100644 index 00000000..7a91fcbf --- /dev/null +++ b/LauncherGUI/src/main/java/pro/gravit/launchergui/config/INIT.java @@ -0,0 +1,10 @@ +package pro.gravit.launchergui.config; + +import pro.gravit.launchergui.api.GuiEngine; +import pro.gravit.launchergui.api.GuiEngineConfig; + +public class INIT extends GuiEngineConfig { + void main(GuiEngine engine) { + engine.configset("version-gui","0.0.1"); + } +} \ No newline at end of file diff --git a/LauncherGUI/src/main/java/pro/gravit/launchergui/gui/login.java b/LauncherGUI/src/main/java/pro/gravit/launchergui/gui/login.java new file mode 100644 index 00000000..1fa18d74 --- /dev/null +++ b/LauncherGUI/src/main/java/pro/gravit/launchergui/gui/login.java @@ -0,0 +1,28 @@ +package pro.gravit.launchergui.gui; + +import java.awt.Container; +import java.awt.Dimension; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JTextField; +import javax.swing.JPasswordField; +import javax.swing.JPanel; +public class login { + public static JButton loginbutton = new JButton("Войти"); + public static JTextField login = new JTextField("Логин"); + public static JPasswordField password = new JPasswordField("Пароль"); + static { + JFrame frame = new JFrame("Имя лаунчера не задано(Лаунчер не собран)"); + JPanel contents = new JPanel(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + contents.add(login); + login.setPreferredSize( new Dimension( 70, 25 ) ); + password.setPreferredSize( new Dimension( 70, 25 ) ); + contents.add(password); + contents.add(loginbutton); + frame.add(contents); + frame.setPreferredSize(new Dimension(400,100)); + frame.pack(); + frame.setVisible(true); + } +} \ No newline at end of file diff --git a/LauncherGUI/src/main/java/pro/gravit/launchergui/helper/initGui.java b/LauncherGUI/src/main/java/pro/gravit/launchergui/helper/initGui.java new file mode 100644 index 00000000..0c4f2840 --- /dev/null +++ b/LauncherGUI/src/main/java/pro/gravit/launchergui/helper/initGui.java @@ -0,0 +1,8 @@ +package pro.gravit.launchergui.helper; + +import pro.gravit.launchergui.api.loading; +public class initGui { + public static void init() { + loading.load("login"); + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 35287581..f4653a51 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ include 'Radon' include 'LauncherCore' include 'LauncherAPI' +include 'LauncherGUI' include 'LauncherAuthlib' include 'ServerWrapper' include 'LaunchServer'