From 46890104660777ad57a777f50beffb4b3575e663 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 29 Dec 2019 15:43:40 +0800
Subject: [PATCH] Remove API preference

---
 app/Http/Controllers/AdminController.php | 4 ----
 config/options.php                       | 1 -
 resources/lang/en/options.yml            | 1 -
 tests/BrowserKitTests/AdminFormsTest.php | 2 --
 4 files changed, 8 deletions(-)

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 6e152061..cfed3206 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -298,10 +298,6 @@ class AdminController extends Controller
                 ->text('player_name_length_max')
                 ->addon(trans('options.general.player_name_length.suffix'));
 
-            $form->select('api_type')
-                    ->option('0', 'CustomSkinLoader API')
-                    ->option('1', 'UniversalSkinAPI');
-
             $form->checkbox('auto_del_invalid_texture')->label()->hint();
 
             $form->checkbox('allow_downloading_texture')->label();
diff --git a/config/options.php b/config/options.php
index 028b3683..a3eb83e5 100644
--- a/config/options.php
+++ b/config/options.php
@@ -8,7 +8,6 @@ return [
     'register_with_player_name' => 'true',
     'require_verification'      => 'false',
     'regs_per_ip'               => '3',
-    'api_type'                  => 'false',
     'announcement'              => 'Welcome to Blessing Skin {version}!',
     'home_pic_url'              => './app/bg.png',
     'custom_css'                => '',
diff --git a/resources/lang/en/options.yml b/resources/lang/en/options.yml
index e1bc445b..23a2f982 100644
--- a/resources/lang/en/options.yml
+++ b/resources/lang/en/options.yml
@@ -126,7 +126,6 @@ general:
   player_name_length:
     title: Player Name Length
     suffix: characters
-  api_type: Prefered JSON API
   auto_del_invalid_texture:
     title: Invalid Textures
     label: Delete invalid textures automatically.
diff --git a/tests/BrowserKitTests/AdminFormsTest.php b/tests/BrowserKitTests/AdminFormsTest.php
index 0b60e1d8..59b30d51 100644
--- a/tests/BrowserKitTests/AdminFormsTest.php
+++ b/tests/BrowserKitTests/AdminFormsTest.php
@@ -117,7 +117,6 @@ class AdminFormsTest extends BrowserKitTestCase
             ))
             ->select('cjk', 'player_name_rule')
             ->type('/^([0-9]+)$/', 'custom_player_name_regexp')
-            ->select('1', 'api_type')
             ->check('auto_del_invalid_texture')
             ->uncheck('allow_downloading_texture')
             ->select('404', 'status_code_for_private')
@@ -132,7 +131,6 @@ class AdminFormsTest extends BrowserKitTestCase
         $this->assertEquals('2048', option('max_upload_file_size'));
         $this->assertEquals('cjk', option('player_name_rule'));
         $this->assertEquals('/^([0-9]+)$/', option('custom_player_name_regexp'));
-        $this->assertEquals('1', option('api_type'));
         $this->assertTrue(option('auto_del_invalid_texture'));
         $this->assertFalse(option('allow_downloading_texture'));
         $this->assertEquals('404', option('status_code_for_private'));