Skip to content
This repository was archived by the owner on Feb 8, 2019. It is now read-only.

Commit e117819

Browse files
InkoHXInkoHX
committed
Merge branch 'release/v0.0.3'
2 parents 97ca01d + b55668f commit e117819

File tree

13 files changed

+146
-99
lines changed

13 files changed

+146
-99
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto detect text files and perform LF normalization
2-
32
* text=auto
43
*.php text eol=lf
54
*.txt text eol=lf
5+
*.png filter=lfs diff=lfs merge=lfs -text

‎.idea/php.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/banner/VectorNetwork.png‎

-409 KB
Loading

‎composer.json‎

Lines changed: 97 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,101 @@
11
{
2-
"name": "vectornetworkproject/themix",
3-
"homepage": "https://www.vector-network.tk",
4-
"type": "project",
5-
"license": "MIT",
6-
"authors": [
7-
{
8-
"name": "InkoHX",
9-
"homepage": "https://twitter.com/InkoHX"
10-
},
11-
{
12-
"name": "DusKong",
13-
"homepage": "https://twitter.com/DUSKONG"
14-
},
15-
{
16-
"name": "yuko fuyutsuki",
17-
"homepage": "https://twitter.com/y_fy_"
18-
},
19-
{
20-
"name": "MazaiCrafty",
21-
"homepage": "https://twitter.com/MazaiCrafty"
22-
},
23-
{
24-
"name": "UramnOIL",
25-
"homepage": "https://twitter.com/UramnOIL"
26-
}
27-
],
28-
"require": {
29-
"php": ">=7.2.0",
30-
"php-64bit": "*",
31-
"ext-bcmath": "*",
32-
"ext-curl": "*",
33-
"ext-crypto": "^0.3.1",
34-
"ext-ctype": "*",
35-
"ext-date": "*",
36-
"ext-gmp": "*",
37-
"ext-hash": "*",
38-
"ext-json": "*",
39-
"ext-mbstring": "*",
40-
"ext-openssl": "*",
41-
"ext-pcre": "*",
42-
"ext-phar": "*",
43-
"ext-pthreads": ">=3.1.7dev",
44-
"ext-reflection": "*",
45-
"ext-sockets": "*",
46-
"ext-spl": "*",
47-
"ext-yaml": ">=2.0.0",
48-
"ext-zip": "*",
49-
"ext-zlib": ">=1.2.11",
50-
"mdanter/ecc": "^0.5.0",
51-
"pocketmine/pocketmine-mp": "^3.3.2",
52-
"pocketmine/raklib": "^0.12.0",
53-
"pocketmine/spl": "^0.3.0",
54-
"pocketmine/binaryutils": "^0.1.0",
55-
"pocketmine/nbt": "^0.2.1",
56-
"pocketmine/math": "^0.2.0",
57-
"pocketmine/snooze": "^0.1.0",
58-
"fuyutsuki/libform": "^0.4.0"
2+
"name": "vectornetworkproject/themix",
3+
"homepage": "https://www.vector-network.tk",
4+
"type": "project",
5+
"license": "MIT",
6+
"authors": [
7+
{
8+
"name": "InkoHX",
9+
"homepage": "https://twitter.com/InkoHX"
5910
},
60-
"autoload": {
61-
"psr-4": {
62-
"": [
63-
"src"
64-
]
65-
}
11+
{
12+
"name": "DusKong",
13+
"homepage": "https://twitter.com/DUSKONG"
6614
},
67-
"repositories": [
68-
{
69-
"type": "git",
70-
"url": "https://github.com/pmmp/PocketMine-MP"
71-
},
72-
{
73-
"type": "git",
74-
"url": "https://github.com/pmmp/RakLib"
75-
},
76-
{
77-
"type": "git",
78-
"url": "https://github.com/pmmp/SPL"
79-
},
80-
{
81-
"type": "git",
82-
"url": "https://github.com/pmmp/BinaryUtils"
83-
},
84-
{
85-
"type": "git",
86-
"url": "https://github.com/pmmp/NBT"
87-
},
88-
{
89-
"type": "git",
90-
"url": "https://github.com/pmmp/Math"
91-
},
92-
{
93-
"type": "git",
94-
"url": "https://github.com/pmmp/Snooze"
95-
},
96-
{
97-
"type": "git",
98-
"url": "https://github.com/fuyutsuki/libform"
99-
}
100-
]
15+
{
16+
"name": "yuko fuyutsuki",
17+
"homepage": "https://twitter.com/y_fy_"
18+
},
19+
{
20+
"name": "MazaiCrafty",
21+
"homepage": "https://twitter.com/MazaiCrafty"
22+
},
23+
{
24+
"name": "UramnOIL",
25+
"homepage": "https://twitter.com/UramnOIL"
26+
}
27+
],
28+
"require": {
29+
"php": ">=7.2.0",
30+
"php-64bit": "*",
31+
"ext-bcmath": "*",
32+
"ext-curl": "*",
33+
"ext-crypto": "^0.3.1",
34+
"ext-ctype": "*",
35+
"ext-date": "*",
36+
"ext-gmp": "*",
37+
"ext-hash": "*",
38+
"ext-json": "*",
39+
"ext-mbstring": "*",
40+
"ext-openssl": "*",
41+
"ext-pcre": "*",
42+
"ext-phar": "*",
43+
"ext-pthreads": ">=3.1.7dev",
44+
"ext-reflection": "*",
45+
"ext-sockets": "*",
46+
"ext-spl": "*",
47+
"ext-yaml": ">=2.0.0",
48+
"ext-zip": "*",
49+
"ext-zlib": ">=1.2.11",
50+
"mdanter/ecc": "^0.5.0",
51+
"pocketmine/pocketmine-mp": "^3.3.2",
52+
"pocketmine/raklib": "^0.12.0",
53+
"pocketmine/spl": "^0.3.0",
54+
"pocketmine/binaryutils": "^0.1.0",
55+
"pocketmine/nbt": "^0.2.1",
56+
"pocketmine/math": "^0.2.0",
57+
"pocketmine/snooze": "^0.1.0",
58+
"fuyutsuki/libform": "^0.4.0"
59+
},
60+
"autoload": {
61+
"psr-4": {
62+
"": [
63+
"src"
64+
]
65+
}
66+
},
67+
"repositories": [
68+
{
69+
"type": "git",
70+
"url": "https://github.com/pmmp/PocketMine-MP"
71+
},
72+
{
73+
"type": "git",
74+
"url": "https://github.com/pmmp/RakLib"
75+
},
76+
{
77+
"type": "git",
78+
"url": "https://github.com/pmmp/SPL"
79+
},
80+
{
81+
"type": "git",
82+
"url": "https://github.com/pmmp/BinaryUtils"
83+
},
84+
{
85+
"type": "git",
86+
"url": "https://github.com/pmmp/NBT"
87+
},
88+
{
89+
"type": "git",
90+
"url": "https://github.com/pmmp/Math"
91+
},
92+
{
93+
"type": "git",
94+
"url": "https://github.com/pmmp/Snooze"
95+
},
96+
{
97+
"type": "git",
98+
"url": "https://github.com/fuyutsuki/libform"
99+
}
100+
]
101101
}

‎plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ softdepend:
66

77
description: "Original game of VectorNetwork"
88
website: "https://vector-network.tk"
9-
version: 0.0.2
9+
version: 0.0.3
1010
authors:
1111
- InkoHX
1212
- MazaiCrafty

‎src/VectorNetworkProject/TheMix/command/PingCommand.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,24 @@
1616

1717
class PingCommand extends PluginCommand
1818
{
19+
/**
20+
* PingCommand constructor.
21+
* @param Plugin $owner
22+
*/
1923
public function __construct(Plugin $owner)
2024
{
2125
parent::__construct('ping', $owner);
2226
$this->setDescription('応答速度を計測します。');
2327
$this->setPermission('the.mix.command.ping');
2428
}
2529

30+
/**
31+
* @param CommandSender $sender
32+
* @param string $commandLabel
33+
* @param array $args
34+
*
35+
* @return bool
36+
*/
2637
public function execute(CommandSender $sender, string $commandLabel, array $args): bool
2738
{
2839
if (!$sender instanceof Player) {

‎src/VectorNetworkProject/TheMix/command/TpsCommand.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,24 @@
1616

1717
class TpsCommand extends PluginCommand
1818
{
19+
/**
20+
* TpsCommand constructor.
21+
* @param Plugin $owner
22+
*/
1923
public function __construct(Plugin $owner)
2024
{
2125
parent::__construct('tps', $owner);
2226
$this->setPermission('the.mix.command.tps');
2327
$this->setDescription('TicksPerSecond');
2428
}
2529

30+
/**
31+
* @param CommandSender $sender
32+
* @param string $commandLabel
33+
* @param array $args
34+
*
35+
* @return bool
36+
*/
2637
public function execute(CommandSender $sender, string $commandLabel, array $args): bool
2738
{
2839
$sender->sendMessage(TextFormat::GREEN.'TPS: '.Server::getInstance()->getTicksPerSecond().'/20');

‎src/VectorNetworkProject/TheMix/event/ThePlayerJoinEvent.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class ThePlayerJoinEvent implements Listener
2222
public function event(PlayerJoinEvent $event)
2323
{
2424
$player = $event->getPlayer();
25+
$event->setJoinMessage('§7[§a参加§7] §e'.$player->getName().'が参加しました。');
2526
$scoreboard = new Scoreboard(TheMix::getInstance()->getServer()->getPluginManager()->getPlugin('ScoreboardsPE')->getPlugin(), '§l§7=== §6THE §aM§cI§eX §7===', ScoreboardAction::CREATE);
2627
$scoreboard->create(ScoreboardDisplaySlot::SIDEBAR, ScoreboardSort::DESCENDING);
2728
$scoreboard->addDisplay($player);

‎src/VectorNetworkProject/TheMix/event/ThePlayerQuitEvent.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ class ThePlayerQuitEvent implements Listener
1616
public function event(PlayerQuitEvent $event)
1717
{
1818
$player = $event->getPlayer();
19+
$event->setQuitMessage('§7[§c退出§7] §e'.$player->getName().'が参加しました。');
1920
}
2021
}

‎src/VectorNetworkProject/TheMix/lib/database/Provider.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212

1313
abstract class Provider
1414
{
15+
/**
16+
* @param string $folder
17+
* @param string $type
18+
*
19+
* @return string
20+
*/
1521
protected static function getPath(string $folder, string $type): string
1622
{
1723
return TheMix::getInstance()->getDataFolder().'/'.$folder.'/'.$type.'/';

0 commit comments

Comments
 (0)