Merge branch 'release/5.1.4'

GravitLauncher · Apr 26, 2020 · aed80e9 · aed80e9
2 parents 45e3d0b + e81b098
commit aed80e9
Show file tree

Hide file tree

Showing 185 changed files with 3,524 additions and 3,616 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,74 +9,74 @@ jobs:
     name: Launcher
     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
+      - name: Cache Gradle
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: gravit-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-launcher
 
-    - 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/modules
-        cd LaunchServer/build/libs/
-        zip -r -9 ../../../artifacts/libraries.zip * -x "LaunchServer.jar" -x "LaunchServer-clean.jar"
-        cp LaunchServer.jar ../../../artifacts/LaunchServer.jar
-        cd ../../../ServerWrapper/build/libs
-        cp ServerWrapper.jar ../../../artifacts/ServerWrapper.jar
-        cd ../../../LauncherAuthlib/build/libs
-        cp LauncherAuthlib.jar ../../../artifacts/LauncherAuthlib.jar
-        cd ../../../
-        cp modules/*_module/build/libs/*.jar artifacts/modules
-        cp modules/*_swmodule/build/libs/*.jar artifacts/modules
-        cp modules/*_lmodule/build/libs/*.jar artifacts/modules
+      - name: Create artifacts
+        run: |
+          mkdir -p artifacts/modules
+          cd LaunchServer/build/libs/
+          zip -r -9 ../../../artifacts/libraries.zip * -x "LaunchServer.jar" -x "LaunchServer-clean.jar"
+          cp LaunchServer.jar ../../../artifacts/LaunchServer.jar
+          cd ../../../ServerWrapper/build/libs
+          cp ServerWrapper.jar ../../../artifacts/ServerWrapper.jar
+          cd ../../../LauncherAuthlib/build/libs
+          cp LauncherAuthlib.jar ../../../artifacts/LauncherAuthlib.jar
+          cd ../../../
+          cp modules/*_module/build/libs/*.jar artifacts/modules
+          cp modules/*_swmodule/build/libs/*.jar artifacts/modules
+          cp modules/*_lmodule/build/libs/*.jar artifacts/modules
 
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: Launcher
-        path: artifacts
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: Launcher
+          path: 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: 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: Pack release
-      if: github.event_name == 'create'
-      run: |
-        cd artifacts/
-        zip -r -9 ../Release.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
+      - 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,6 +107,6 @@ buildnumber
 *.directory
 cmd.bat
 cmd.sh
+project/target
 ## PVS Studio
 .PVS-Studio/
-project/target
diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle
@@ -70,7 +70,7 @@ task cleanjar(type: Jar, dependsOn: jar) {
 
 dependencies {
     pack project(':LauncherAPI')
-    bundle group: 'org.fusesource.jansi', name:'jansi', version: rootProject['verJansi']
+    bundle group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi']
     bundle group: 'org.jline', name: 'jline', version: rootProject['verJline']
     bundle group: 'org.jline', name: 'jline-reader', version: rootProject['verJline']
     bundle group: 'org.jline', name: 'jline-terminal', version: rootProject['verJline']
@@ -117,16 +117,18 @@ task hikari(type: Copy) {
 task launch4j(type: Copy) {
     duplicatesStrategy = 'EXCLUDE'
     into "$buildDir/libs/libraries/launch4j"
-    from(configurations.launch4j.collect { it.isDirectory() ? it : ((it.getName().startsWith("launch4j") && it.getName().contains("workdir")) ? zipTree(it) : it) })
+    from(configurations.launch4j.collect {
+        it.isDirectory() ? it : ((it.getName().startsWith("launch4j") && it.getName().contains("workdir")) ? zipTree(it) : it)
+    })
     includeEmptyDirs false
     eachFile { FileCopyDetails fcp ->
-            if (fcp.relativePath.pathString.startsWith("launch4j-") &&
-                    fcp.relativePath.pathString.contains("workdir")) {
-                def segments = fcp.relativePath.segments
-                def pathSegments = segments[1..-1] as String[]
-                fcp.relativePath = new RelativePath(!fcp.file.isDirectory(), pathSegments)
-            } else if (fcp.relativePath.pathString.contains("META-INF")) fcp.exclude()
-            fcp.mode = 0755
+        if (fcp.relativePath.pathString.startsWith("launch4j-") &&
+                fcp.relativePath.pathString.contains("workdir")) {
+            def segments = fcp.relativePath.segments
+            def pathSegments = segments[1..-1] as String[]
+            fcp.relativePath = new RelativePath(!fcp.file.isDirectory(), pathSegments)
+        } else if (fcp.relativePath.pathString.contains("META-INF")) fcp.exclude()
+        fcp.mode = 0755
     }
 }