refactor: Refactor project to use Pharynx for improved plugin managem…

…ent and build process
nicholass003 · Sep 29, 2024 · f4d9c26 · f4d9c26
1 parent 4a9cc66
commit f4d9c26
Show file tree

Hide file tree

Showing 25 changed files with 88 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,26 @@
+name: Build phar
+on:
+  push:
+    branches: [stable]
+jobs:
+  pharynx:
+    name: build phar
+    permissions:
+      contents: write
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer
+      - run: composer install --ignore-platform-reqs
+      - uses: SOF3/[email protected]
+        id: pharynx
+        with:
+          additional-assets: |
+            assets/icon.png
+      - uses: actions/upload-artifact@v3
+        with:
+          name: TopStats.phar
+          path: ${{steps.pharynx.outputs.output-phar}}
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,18 @@
+# Ignore vendor folder
+/vendor/
+
+# Ignore Composer dependencies
+/composer.lock
+.text
+extract.php
+
+# Ignore log files
+*.log
+
+# Ignore environment files
+.env
+.env.local
+
+# Ignore IDE specific files
+.idea/
+*.iml
diff --git a/.poggit.yml b/.poggit.yml
@@ -2,15 +2,9 @@
 build-by-default: true
 branches:
 - main
+- stable
 projects:
   TopStats:
     path: ""
     icon: "assets/icon.png"
-    libs:
-      - src: DaPigGuy/libPiggyEconomy/libPiggyEconomy
-        version: ^3.0.3
-      - src: Paroxity/Commando/Commando
-        version: ^3.2.1
-      - src: ifera-mc/UpdateNotifier/UpdateNotifier
-        version: ^3.1.0
 ...
diff --git a/composer.json b/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "nicholass003/topstats",
+    "description": "A TopStats plugin for PocketMine-MP.",
+    "type": "project",
+    "require": {
+        "pocketmine/pocketmine-mp": "^5.0.0",
+        "dapigguy/libpiggyeconomy": "^3.0.3",
+        "ifera-mc/update-notifier": "dev-master",
+        "paroxity/commando": "^3.2.1",
+        "sof3/infoapi": "dev-master"
+    },
+    "require-dev": {
+        "sof3/pharynx": "^0.3.6"
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/ifera-mc/UpdateNotifier"
+        }
+    ],
+    "autoload": {
+        "classmap": ["src"]
+    },
+    "scripts": {
+        "build": "php -dphar.readonly=0 vendor/bin/pharynx -i=. -c -p=TopStats.phar"
+    }
+}
diff --git a/...command/subcommand/TopStatsSubCommand.php → src/command/subcommand/base.php b/...command/subcommand/TopStatsSubCommand.php → src/command/subcommand/base.php
diff --git a/...s/command/subcommand/CreateSubCommand.php → src/command/subcommand/create.php b/...s/command/subcommand/CreateSubCommand.php → src/command/subcommand/create.php
diff --git a/...s/command/subcommand/DeleteSubCommand.php → src/command/subcommand/delete.php b/...s/command/subcommand/DeleteSubCommand.php → src/command/subcommand/delete.php
diff --git a/...ats/command/subcommand/ListSubCommand.php → src/command/subcommand/list.php b/...ats/command/subcommand/ListSubCommand.php → src/command/subcommand/list.php
diff --git a/...command/subcommand/TeleportSubCommand.php → src/command/subcommand/teleport.php b/...command/subcommand/TeleportSubCommand.php → src/command/subcommand/teleport.php
diff --git a/...ats/command/subcommand/TypeSubCommand.php → src/command/subcommand/type.php b/...ats/command/subcommand/TypeSubCommand.php → src/command/subcommand/type.php
diff --git a/...s003/topstats/command/TopStatsCommand.php → src/command/topstats.php b/...s003/topstats/command/TopStatsCommand.php → src/command/topstats.php
diff --git a/...003/topstats/database/data/DataAction.php → src/database/data/action.php b/...003/topstats/database/data/DataAction.php → src/database/data/action.php
diff --git a/...ss003/topstats/database/data/DataType.php → src/database/data/type.php b/...ss003/topstats/database/data/DataType.php → src/database/data/type.php
diff --git a/...holass003/topstats/database/IDatabase.php → src/database/idatabase.php b/...holass003/topstats/database/IDatabase.php → src/database/idatabase.php
diff --git a/...ass003/topstats/database/JsonDatabase.php → src/database/json.php b/...ass003/topstats/database/JsonDatabase.php → src/database/json.php
diff --git a/...s003/topstats/leaderboard/Leaderboard.php → src/leaderboard/leaderboard.php b/...s003/topstats/leaderboard/Leaderboard.php → src/leaderboard/leaderboard.php
diff --git a/...pstats/leaderboard/LeaderboardManager.php → src/leaderboard/manager.php b/...pstats/leaderboard/LeaderboardManager.php → src/leaderboard/manager.php
diff --git a/...ss003/topstats/listener/EventListener.php → src/listener/events.php b/...ss003/topstats/listener/EventListener.php → src/listener/events.php
diff --git a/src/nicholass003/topstats/model/IModel.php → src/model/imodel.php b/src/nicholass003/topstats/model/IModel.php → src/model/imodel.php
diff --git a/...003/topstats/model/player/PlayerModel.php → src/model/player/player.php b/...003/topstats/model/player/PlayerModel.php → src/model/player/player.php
diff --git a/...lass003/topstats/model/text/TextModel.php → src/model/text/text.php b/...lass003/topstats/model/text/TextModel.php → src/model/text/text.php
diff --git a/...holass003/topstats/model/ModelVariant.php → src/model/variant.php b/...holass003/topstats/model/ModelVariant.php → src/model/variant.php
diff --git a/src/nicholass003/topstats/TopStats.php → src/plugin.php b/src/nicholass003/topstats/TopStats.php → src/plugin.php
diff --git a/...nicholass003/topstats/task/UpdateTask.php → src/task/update.php b/...nicholass003/topstats/task/UpdateTask.php → src/task/update.php
diff --git a/src/nicholass003/topstats/utils/Utils.php → src/utils/util.php b/src/nicholass003/topstats/utils/Utils.php → src/utils/util.php
@@ -35,9 +35,9 @@
 use pocketmine\entity\Skin;
 use pocketmine\player\Player;
 use pocketmine\Server;
+use SOFe\InfoAPI\InfoAPI;
 use function count;
 use function floor;
-use function str_replace;
 use function uasort;
 
 class Utils{
@@ -130,7 +130,12 @@ public static function validateTextFormat(string $type, array $data, string $tex
 		if($type === DataType::ONLINE_TIME){
 			$formattedData = self::timeFormat($data[$type]);
 		}
-		return str_replace(["{player}", "{" . $type . "}", "{rank_" . $type . "}", "{line}"], [$data["name"], $formattedData, $rank, "\n"], $text);
+		return InfoAPI::render(TopStats::getInstance(), $text, [
+			"player" => $data["name"],
+			$type => $formattedData,
+			"rank_" . $type => $rank,
+			"line" => "\n"
+		]);
 	}
 
 	public static function timeFormat(int $time) : string{
@@ -143,7 +148,15 @@ public static function timeFormat(int $time) : string{
 		$seconds = $time % 60;
 
 		$format = TopStats::getInstance()->getTimeFormat();
-		return str_replace(["{year}", "{month}", "{week}", "{day}", "{hour}", "{minute}", "{second}"], [$years, $months, $weeks, $days, $hours, $minutes, $seconds], $format);
+		return InfoAPI::render(TopStats::getInstance(), $format, [
+			"year" => $years,
+			"month" => $months,
+			"week" => $weeks,
+			"day" => $days,
+			"hour" => $hours,
+			"minute" => $minutes,
+			"second" => $seconds
+		]);
 	}
 
 	public static function moneyTransaction(Player $player, float|int $money) : bool{