From 0d9952d53eb5b1210d834d0940c9ba5950b298a3 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 30 Jul 2018 17:07:19 +0100
Subject: [PATCH] Rename BaseLang -> Language

---
 src/pocketmine/Server.php                     | 32 +++++++++----------
 .../lang/{BaseLang.php => Language.php}       |  2 +-
 src/pocketmine/wizard/SetupWizard.php         |  8 ++---
 3 files changed, 21 insertions(+), 21 deletions(-)
 rename src/pocketmine/lang/{BaseLang.php => Language.php} (99%)

diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index c6db4953e..d900c99cb 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -45,7 +45,7 @@ use pocketmine\inventory\CraftingManager;
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\lang\BaseLang;
+use pocketmine\lang\Language;
 use pocketmine\lang\LanguageNotFoundException;
 use pocketmine\lang\TextContainer;
 use pocketmine\level\biome\Biome;
@@ -243,8 +243,8 @@ class Server{
 	/** @var int */
 	private $autoSaveTicks = 6000;
 
-	/** @var BaseLang */
-	private $baseLang;
+	/** @var Language */
+	private $language;
 	/** @var bool */
 	private $forceLanguage = false;
 
@@ -1443,15 +1443,15 @@ class Server{
 			define('pocketmine\DEBUG', (int) $this->getProperty("debug.level", 1));
 
 			$this->forceLanguage = (bool) $this->getProperty("settings.force-language", false);
-			$selectedLang = $this->getProperty("settings.language", BaseLang::FALLBACK_LANGUAGE);
+			$selectedLang = $this->getProperty("settings.language", Language::FALLBACK_LANGUAGE);
 			try{
-				$this->baseLang = new BaseLang($selectedLang);
+				$this->language = new Language($selectedLang);
 			}catch(LanguageNotFoundException $e){
 				$this->logger->error($e->getMessage());
 				try{
-					$this->baseLang = new BaseLang(BaseLang::FALLBACK_LANGUAGE);
+					$this->language = new Language(Language::FALLBACK_LANGUAGE);
 				}catch(LanguageNotFoundException $e){
-					$this->logger->emergency("Fallback language \"" . BaseLang::FALLBACK_LANGUAGE . "\" not found");
+					$this->logger->emergency("Fallback language \"" . Language::FALLBACK_LANGUAGE . "\" not found");
 					return;
 				}
 			}
@@ -1460,19 +1460,19 @@ class Server{
 
 			if(\pocketmine\IS_DEVELOPMENT_BUILD){
 				if(!((bool) $this->getProperty("settings.enable-dev-builds", false))){
-					$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error1", [\pocketmine\NAME]));
-					$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error2"));
-					$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error3"));
-					$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error4", ["settings.enable-dev-builds"]));
+					$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error1", [\pocketmine\NAME]));
+					$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error2"));
+					$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error3"));
+					$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error4", ["settings.enable-dev-builds"]));
 					$this->forceShutdown();
 
 					return;
 				}
 
 				$this->logger->warning(str_repeat("-", 40));
-				$this->logger->warning($this->baseLang->translateString("pocketmine.server.devBuild.warning1", [\pocketmine\NAME]));
-				$this->logger->warning($this->baseLang->translateString("pocketmine.server.devBuild.warning2"));
-				$this->logger->warning($this->baseLang->translateString("pocketmine.server.devBuild.warning3"));
+				$this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning1", [\pocketmine\NAME]));
+				$this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning2"));
+				$this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning3"));
 				$this->logger->warning(str_repeat("-", 40));
 			}
 
@@ -2430,10 +2430,10 @@ class Server{
 
 
 	/**
-	 * @return BaseLang
+	 * @return Language
 	 */
 	public function getLanguage(){
-		return $this->baseLang;
+		return $this->language;
 	}
 
 	/**
diff --git a/src/pocketmine/lang/BaseLang.php b/src/pocketmine/lang/Language.php
similarity index 99%
rename from src/pocketmine/lang/BaseLang.php
rename to src/pocketmine/lang/Language.php
index 628e38951..f3a264323 100644
--- a/src/pocketmine/lang/BaseLang.php
+++ b/src/pocketmine/lang/Language.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\lang;
 
-class BaseLang{
+class Language{
 
 	public const FALLBACK_LANGUAGE = "eng";
 
diff --git a/src/pocketmine/wizard/SetupWizard.php b/src/pocketmine/wizard/SetupWizard.php
index 31567b538..24930cfed 100644
--- a/src/pocketmine/wizard/SetupWizard.php
+++ b/src/pocketmine/wizard/SetupWizard.php
@@ -27,7 +27,7 @@ declare(strict_types=1);
  */
 namespace pocketmine\wizard;
 
-use pocketmine\lang\BaseLang;
+use pocketmine\lang\Language;
 use pocketmine\lang\LanguageNotFoundException;
 use pocketmine\utils\Config;
 use pocketmine\utils\Internet;
@@ -38,7 +38,7 @@ class SetupWizard{
 	public const DEFAULT_PLAYERS = 20;
 	public const DEFAULT_GAMEMODE = 0;
 
-	/** @var BaseLang */
+	/** @var Language */
 	private $lang;
 
 	public function __construct(){
@@ -49,7 +49,7 @@ class SetupWizard{
 		$this->message(\pocketmine\NAME . " set-up wizard");
 
 		try{
-			$langs = BaseLang::getLanguageList();
+			$langs = Language::getLanguageList();
 		}catch(LanguageNotFoundException $e){
 			$this->error("No language files found, please use provided builds or clone the repository recursively.");
 			return false;
@@ -68,7 +68,7 @@ class SetupWizard{
 			}
 		}while($lang === null);
 
-		$this->lang = new BaseLang($lang);
+		$this->lang = new Language($lang);
 
 		$this->message($this->lang->get("language_has_been_selected"));