Merge branch 'release/1.1.0'

# Conflicts: # src/main/java/pro/gravit/launcher/client/RuntimeSecurityService.java
GravitLauncher · Apr 26, 2020 · ad1345d · ad1345d
2 parents 41845ff + 45c53c4
commit ad1345d
Show file tree

Hide file tree

Showing 52 changed files with 1,331 additions and 1,179 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,5 +1,5 @@
 name: push
-on: 
+on:
   push:
   create:
     tags:
@@ -9,67 +9,67 @@ jobs:
     name: LauncherRuntime
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        submodules: recursive
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
 
-    - name: Cache Gradle
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: gravit-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-launcher-runtime
+      - name: Cache Gradle
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: gravit-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-launcher-runtime
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
 
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
 
-    - name: Build with Gradle
-      run: ./gradlew build
+      - name: Build with Gradle
+        run: ./gradlew build
 
-    - name: Create artifacts
-      run: |
-        mkdir -p artifacts
-        cd runtime
-        zip -r -9 ../artifacts/runtime.zip *
-        cd ../build/libs
-        cp *.jar ../../artifacts
-        
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: LauncherRuntime
-        path: artifacts
+      - name: Create artifacts
+        run: |
+          mkdir -p artifacts
+          cd runtime
+          zip -r -9 ../artifacts/runtime.zip *
+          cd ../build/libs
+          cp *.jar ../../artifacts
 
-    - name: Create release
-      id: create_release
-      uses: actions/create-release@v1
-      if: github.event_name == 'create'
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: GravitLauncher ${{ github.ref }}
-        draft: false
-        prerelease: false
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: LauncherRuntime
+          path: artifacts
 
-    - name: Pack release
-      if: github.event_name == 'create'
-      run: |
-        cd artifacts/
-        zip -r -9 ../Release.zip *
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
+        if: github.event_name == 'create'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: GravitLauncher ${{ github.ref }}
+          draft: false
+          prerelease: false
 
-    - name: Upload release
-      if: github.event_name == 'create'
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: ./Release.zip
-        asset_name: Release.zip
-        asset_content_type: application/zip
+      - name: Pack release
+        if: github.event_name == 'create'
+        run: |
+          cd artifacts/
+          zip -r -9 ../Release.zip *
+
+      - name: Upload release
+        if: github.event_name == 'create'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./Release.zip
+          asset_name: Release.zip
+          asset_content_type: application/zip
diff --git a/.gitignore b/.gitignore
@@ -107,5 +107,6 @@ buildnumber
 *.directory
 cmd.bat
 cmd.sh
+project/target
 ## PVS Studio
 .PVS-Studio/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -23,13 +23,13 @@ build:
   stage: build
   script: gradle -Dorg.gradle.daemon=false --build-cache assemble
   after_script:
-   - apt-get -y update
-   - apt-get -y install zip
-   - mkdir -p artifacts
-   - cd runtime
-   - zip -r -9 ../artifacts/runtime.zip *
-   - cd ../build/libs
-   - cp *.jar ../../artifacts
+    - apt-get -y update
+    - apt-get -y install zip
+    - mkdir -p artifacts
+    - cd runtime
+    - zip -r -9 ../artifacts/runtime.zip *
+    - cd ../build/libs
+    - cp *.jar ../../artifacts
   cache:
     key: "$CI_COMMIT_REF_NAME"
     policy: push
@@ -39,7 +39,7 @@ build:
   artifacts:
     expire_in: 6 week
     paths:
-    - artifacts
+      - artifacts
 
 test:
   stage: test

diff --git a/build.gradle b/build.gradle
@@ -6,12 +6,12 @@ plugins {
 }
 javafx {
     version = "12"
-    modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing' ]
+    modules = ['javafx.controls', 'javafx.fxml', 'javafx.swing']
 }
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 group 'pro.gravit.launcher'
-version '1.0.0'
+version '1.1.0'
 def mainClassName = "pro.gravit.launcher.client.JavaRuntimeModule"
 
 tasks.withType(JavaCompile) {
@@ -22,8 +22,8 @@ tasks.withType(JavaCompile) {
 
 jar {
     manifest.attributes("Module-Main-Class": mainClassName,
-                        "Module-Config-Class": "pro.gravit.launcher.client.GuiModuleConfig",
-                        "Module-Config-Name": "JavaRuntime")
+            "Module-Config-Class": "pro.gravit.launcher.client.GuiModuleConfig",
+            "Module-Config-Name": "JavaRuntime")
 }
 
 repositories {
@@ -40,3 +40,9 @@ dependencies {
     implementation 'com.github.oshi:oshi-core:4.5.2'
     implementation 'com.google.code.gson:gson:2.8.6'
 }
+
+wrapper {
+    distributionType = Wrapper.DistributionType.ALL
+}
+
+defaultTasks 'build'
diff --git a/compat/lang/runtime_en.properties b/compat/lang/runtime_en.properties
@@ -1,5 +1,4 @@
 #GravitLauncher (en) lang file
-
 ###Login
 runtime.scenes.login.login.login=LOGIN...
 runtime.scenes.login.login.password=PASS...
@@ -14,15 +13,13 @@ runtime.scenes.login.login.newsArea=
 runtime.scenes.login.login.textLogin=You do not have an account?
 runtime.scenes.login.login.hideTooltip=Hide
 runtime.scenes.login.login.closeTooltip=Close
-
 ###Processing
 runtime.overlay.processing.processing.description=LOADING...
 runtime.overlay.processing.text.auth=Log-in
 runtime.overlay.processing.text.authAvailability=Updating available authorization methods
 runtime.overlay.processing.text.launcher=Check for launcher updates
 runtime.overlay.processing.text.setprofile=Change profile
 runtime.overlay.processing.text.profiles=Getting a list of servers
-
 ###ServerMenu
 runtime.scenes.servermenu.servermenu.heading=HEADER
 runtime.scenes.servermenu.servermenu.headingOnline=? / ?
@@ -34,43 +31,36 @@ runtime.scenes.servermenu.servermenu.closeTooltip=Close
 runtime.scenes.servermenu.servermenu.settingsTooltip=Settings
 runtime.scenes.servermenu.servermenu.consoleTooltip=Console
 runtime.scenes.servermenu.servermenu.logoutTooltip=Logout
-
 ###Components
 #serverButton
 runtime.scenes.components.serverButton.online=
 runtime.scenes.components.serverButton.nameServer=
 runtime.scenes.components.serverButton.genreServer=
-
 #dialogApply
 runtime.scenes.components.dialogApply.headingDialog=DIALOGUE TITLE
 runtime.scenes.components.dialogApply.textDialog=
 runtime.scenes.components.dialogApply.rejectTooltip=Reject
 runtime.scenes.components.dialogApply.applyTooltip=Apply
 runtime.scenes.components.dialogApply.closeTooltip=Close dialog
-
 #dialogPane
 runtime.scenes.components.dialog.headingDialog=DIALOGUE TITLE
 runtime.scenes.components.dialog.textDialog=
 runtime.scenes.components.dialog.applyTooltip=Apply
 runtime.scenes.components.dialog.closeTooltip=Close dialog
-
 #dialogTextInput
 runtime.scenes.components.dialogTextInput.headingDialog=DIALOGUE TITLE
 runtime.scenes.components.dialogTextInput.2fa=SECOND 2FA SECURITY CODE ...
 runtime.scenes.components.dialogTextInput.forgot2fa=USE BACKUP CODE
 runtime.scenes.components.dialogTextInput.applyTooltip=Apply
 runtime.scenes.components.dialogTextInput.closeTooltip=Close dialog
-
 #Notification
 runtime.scenes.components.notification.notificationHeading=
 runtime.scenes.components.notification.notificationText=
-
 ###Options
 runtime.scenes.options.options.headingOptional=OPTIONAL MODS
 runtime.scenes.options.options.optionsTooltip=Apply
 runtime.scenes.options.options.hideTooltip=Hide
 runtime.scenes.options.options.closeTooltip=Close
-
 ###Settings
 runtime.scenes.settings.settings.langTooltip=language selection
 runtime.scenes.settings.settings.hideTooltip=Hide
@@ -91,21 +81,19 @@ runtime.scenes.settings.langChanged.description=Restart launcher to apply change
 runtime.scenes.settings.exitDialog.header=Sign out
 runtime.scenes.settings.exitDialog.description=Are you sure you want to sign out?\nLauncher will forget your username and password and you will return to the login screen
 runtime.scenes.settings.exitDialog.processing=Sign out...
-runtime.scenes.settings.deletedir.header = Deleting a folder with clients
-runtime.scenes.settings.deletedir.description = Are you sure you want to completely delete all files in the client folder?
-runtime.scenes.settings.deletedir.fail.header = Error deleting
-runtime.scenes.settings.deletedir.fail.description = An error occurred while deleting the folder. See the logs for more details.
+runtime.scenes.settings.deletedir.header=Deleting a folder with clients
+runtime.scenes.settings.deletedir.description=Are you sure you want to completely delete all files in the client folder?
+runtime.scenes.settings.deletedir.fail.header=Error deleting
+runtime.scenes.settings.deletedir.fail.description=An error occurred while deleting the folder. See the logs for more details.
 runtime.scenes.settings.settings.ramLabel=
 runtime.scenes.settings.settings.path=
-
 ###Debug
 runtime.overlay.debug.debug.headingDebug=DEBUG
 runtime.overlay.debug.debug.copyTooltip=Copy log to clipboard
 runtime.overlay.debug.debug.killTooltip=kill process
 runtime.overlay.debug.debug.version=
 runtime.overlay.debug.debug.hideTooltip=Hide
 runtime.overlay.debug.debug.closeTooltip=Close
-
 ###Console
 runtime.scenes.console.console.headingConsole=Console
 runtime.scenes.console.console.hideTooltip=Hide
@@ -115,7 +103,6 @@ runtime.scenes.console.console.send=EXECUTE
 runtime.scenes.console.console.sendTooltip=Run the command on the server
 runtime.scenes.console.console.commandInput=Enter the command ...
 runtime.scenes.console.console.version=
-
 ###Update
 runtime.overlay.update.update.headingUpdate=Downloading files
 runtime.overlay.update.update.hideTooltip=Hide