Merge remote-tracking branch 'origin/dev' into scriptsRewrite

Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java

@@ -14,6 +14,7 @@
 import pro.gravit.launcher.managers.ClientGsonManager;
 import pro.gravit.launcher.managers.ClientHookManager;
 import pro.gravit.launcher.modules.events.PreConfigPhase;
+import pro.gravit.launcher.patches.FMLPatcher;
 import pro.gravit.launcher.profiles.ClientProfile;
 import pro.gravit.launcher.profiles.PlayerProfile;
 import pro.gravit.launcher.request.Request;
@@ -294,6 +295,7 @@ private static void launch(ClientProfile profile, Params params) throws Throwabl
         {
             LogHelper.info("ClassLoader URL: %s", u.toString());
         }
+        FMLPatcher.apply();
         MethodHandle mainMethod = MethodHandles.publicLookup().findStatic(mainClass, "main", MethodType.methodType(void.class, String[].class)).asFixedArity();
         Launcher.LAUNCHED.set(true);
         JVMHelper.fullGC();

compat/auth/laravel/authcontroller/LauncherAuthController.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+
+class LauncherAuthController extends Controller
+{
+    public function json(Request $request) {
+        $data = json_decode($request->getContent());
+
+        if ($data->apiKey !== env('LAUNCHER_APIKEY')) {
+            return response()->json([
+                'error' => 'Неверный ключ. Обратитесь к администратору',
+            ]);
+        }
+
+        if (Auth::attempt(['name' => $data->username, 'password' => $data->password])) {
+            $perm = DB::table('users')
+                ->select('launcher_permission')
+                ->where('name', '=', $data->username)
+                ->first();
+
+            return response()->json([
+                'username' => $data->username,
+                'permission' => $perm->launcher_permission,
+            ]);
+        } else {
+            return response()->json([
+                'error' => 'Неверный логин или пароль',
+            ]);
+        }
+    }
+}

compat/auth/laravel/authcontroller/README.MD

@@ -0,0 +1,9 @@
+#Контроллер авторизации методом json
+
+Route:
+```php
+Route::put('launcher/auth', 'LauncherAuthController@json');
+```
+
+Добавить в **.env** строку `LAUNCHER_APIKEY=none`
+Где `none` ваш apiKey

compat/auth/laravel/authcontroller/migrations/2020_03_05_151322_add_permission_collum.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPermissionCollum extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->integer('launcher_permission')->default('0');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('launcher_permission');
+        });
+    }
+}

compat/auth/laravel/migrations/2020_03_04_172425_create_hwid_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHwidTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users_hwids', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->tinyInteger('isBanned')->default('0');
+            $table->text('totalMemory');
+            $table->text('serialNumber');
+            $table->text('HWDiskSerial');
+            $table->text('processorID');
+            $table->text('macAddr');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('users_hwids');
+    }
+}

compat/auth/laravel/migrations/2020_03_05_140131_add_auth_handler_collums.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAuthHandlerCollums extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->char('uuid', '36')->unique()->nullable();
+            $table->char('accessToken', '32')->nullable();
+            $table->string('serverID', '41')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('uuid');
+            $table->dropColumn('accessToken');
+            $table->dropColumn('serverID');
+        });
+    }
+}

compat/auth/laravel/migrations/2020_03_05_142041_add_hwid_handler_collums.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddHwidHandlerCollums extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->bigInteger('hwid')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('hwid');
+        });
+    }
+}

compat/auth/laravel/migrations/README.MD

@@ -0,0 +1 @@
+# Миграции для Laravel