Merge branch 'dev/4.0'

fuyutsuki · Mar 26, 2021 · a2382db · a2382db
2 parents 7a2386d + 147a523
commit a2382db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -10,7 +10,7 @@ mcpe-protocol:
   - 428 # 1.16.210
 softdepend:
   # aieuo/Mineflow
-  - Mineflow # >= 1.3
+  - Mineflow # >= 2.0
 virions:
   # jojoe77777/libFormAPI
   - libFormAPI # >= 1.3

diff --git a/src/jp/mcbe/fuyutsuki/Texter/Main.php b/src/jp/mcbe/fuyutsuki/Texter/Main.php
@@ -152,11 +152,12 @@ private function loadFloatingTexts() {
 		$worldsPath = $this->findWorldsPath();
 		foreach ($worldsPath as $worldPath) {
 			$folderName = $this->getFileName($worldPath);
-			if (FloatingTextData::getInstance($folderName) !== null) {
+			$floatingTextData = FloatingTextData::getInstance($folderName);
+			if ($floatingTextData === null) {
 				$floatingTextData = new FloatingTextData($this, $folderName);
-				$floatingTextData->generateFloatingTexts($this);
 			}
-			$this->getLogger()->debug("Loaded FloatingTextCluster file: {$folderName}.json");
+			$floatingTextData->generateFloatingTexts($this);
+			$this->getLogger()->debug("Loaded FloatingText file: {$folderName}.json");
 		}
 	}
 
@@ -213,9 +214,10 @@ private function mineflowLinkage() {
 		if ($mineflow !== null) {
 			/** @var MineflowMain $mineflow */
 			Mineflow::setAvailable();
+
 			$variableHelper = $mineflow::getVariableHelper();
-			foreach (DefaultVariables::getServerVariables() as $defaultVariable) {
-				$variableHelper->add($defaultVariable);
+			foreach (DefaultVariables::getServerVariables() as $varName => $defaultVariable) {
+				$variableHelper->add($varName, $defaultVariable);
 			}
 			Mineflow::setVariableHelper($variableHelper);
 		}

diff --git a/src/jp/mcbe/fuyutsuki/Texter/i18n/MineflowLang.php b/src/jp/mcbe/fuyutsuki/Texter/i18n/MineflowLang.php
@@ -30,6 +30,9 @@ public function getAll(): array {
 		return $this->lang;
 	}
 
+	/**
+	 * @return self[]
+	 */
 	public static function all(): array {
 		return self::$instances;
 	}