Skip to content
This repository was archived by the owner on Jan 9, 2018. It is now read-only.

Commit bf32d37

Browse files
shoghicpshoghicp
committed
v1.4.0, added FolderPluginLoader (needed for plugin development)
1 parent 6a95171 commit bf32d37

6 files changed

Lines changed: 423 additions & 9 deletions

File tree

‎LICENSE‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
### Warning: This version is for the new PocketMine-MP API
44

5+
This program is free software: you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation, either version 3 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License
16+
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
18+
519
## Installation
620
- Drop it into the PocketMine's `plugins/` folder.
721
- Restart the server. The plugin will be loaded

‎plugin.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: DevTools
22
main: DevTools\DevTools
3-
version: 1.3.0
3+
version: 1.4.0
44
api: [1.0.0]
55
load: STARTUP
66
author: PocketMine Team
77
authors: [shoghicp]
8-
description: Plugin that allows the creation of Phar plugins, direct code execution and more.
8+
description: Helps develop and distribute PocketMine-MP plugins
99
website: https://github.com/PocketMine/DevTools
1010
commands:
1111
makeserver:
@@ -19,7 +19,7 @@ commands:
1919
checkperm:
2020
description: Checks a permission value for the current sender, or a player
2121
usage: "/checkperm <node> [playerName]"
22-
permission: devtools.command.checkperm
22+
permission: "devtools.command.checkperm;devtools.command.checkperm.other"
2323
permissions:
2424
devtools:
2525
default: op

‎src/DevTools/DevTools.php‎

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,55 @@
11
<?php
22

3+
/*
4+
* DevTools plugin for PocketMine-MP
5+
* Copyright (C) 2014 PocketMine Team <https://github.com/PocketMine/SimpleAuth>
6+
*
7+
* This program is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU Lesser General Public License as published by
9+
* the Free Software Foundation, either version 3 of the License, or
10+
* (at your option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Public License for more details.
16+
*/
17+
318
namespace DevTools;
419

20+
use FolderPluginLoader\FolderPluginLoader;
521
use pocketmine\command\Command;
622
use pocketmine\command\CommandSender;
723
use pocketmine\network\protocol\Info;
824
use pocketmine\permission\Permission;
925
use pocketmine\Player;
10-
use pocketmine\plugin\FolderPluginLoader;
1126
use pocketmine\plugin\Plugin;
1227
use pocketmine\plugin\PluginBase;
1328
use pocketmine\Server;
1429
use pocketmine\utils\TextFormat;
1530

1631
class DevTools extends PluginBase{
32+
33+
public function onLoad(){
34+
$this->getServer()->getLoader()->add("FolderPluginLoader", array(
35+
$this->getFile() . "src"
36+
));
37+
$this->getServer()->getPluginManager()->registerInterface("FolderPluginLoader\\FolderPluginLoader");
38+
console("[INFO] Registered folder plugin loader");
39+
}
40+
1741
public function onEnable(){
1842
@mkdir($this->getDataFolder());
1943
}
2044

2145
public function onCommand(CommandSender $sender, Command $command, $label, array $args){
2246
switch($command->getName()){
2347
case "makeplugin":
24-
return $this->makePluginCommand($sender, $command, $label, $args);
48+
if(isset($args[0]) and $args[0] === "FolderPluginLoader"){
49+
return $this->makePluginLoader($sender, $command, $label, $args);
50+
}else{
51+
return $this->makePluginCommand($sender, $command, $label, $args);
52+
}
2553
break;
2654
case "makeserver":
2755
return $this->makeServerCommand($sender, $command, $label, $args);
@@ -41,7 +69,7 @@ private function permissionCheckCommand(CommandSender $sender, Command $command,
4169
}
4270
$node = strtolower($args[0]);
4371
if(isset($args[1])){
44-
if(($player = Player::get($args[1])) instanceof Player){
72+
if(($player = $this->getServer()->getPlayer($args[1])) instanceof Player){
4573
$target = $player;
4674
}else{
4775
return false;
@@ -72,6 +100,38 @@ private function permissionCheckCommand(CommandSender $sender, Command $command,
72100
}
73101
}
74102

103+
private function makePluginLoader(CommandSender $sender, Command $command, $label, array $args){
104+
$pharPath = $this->getDataFolder() . DIRECTORY_SEPARATOR . "FolderPluginLoader.phar";
105+
if(file_exists($pharPath)){
106+
$sender->sendMessage("Phar plugin already exists, overwriting...");
107+
@unlink($pharPath);
108+
}
109+
$phar = new \Phar($pharPath);
110+
$phar->setMetadata([
111+
"name" => "FolderPluginLoader",
112+
"version" => "1.0.0",
113+
"main" => "FolderPluginLoader\\Main",
114+
"api" => array("1.0.0"),
115+
"depend" => array(),
116+
"description" => "Loader of folder plugins",
117+
"authors" => array("PocketMine Team"),
118+
"website" => "https://github.com/PocketMine/DevTools",
119+
"creationDate" => time()
120+
]);
121+
$phar->setStub('<?php __HALT_COMPILER();');
122+
$phar->setSignatureAlgorithm(\Phar::SHA1);
123+
$phar->startBuffering();
124+
125+
$phar->addFromString("plugin.yml", "name: FolderPluginLoader\nversion: 1.0.0\nmain: FolderPluginLoader\\Main\napi: [1.0.0]\n");
126+
$phar->addFile($this->getFile() . "src/FolderPluginLoader/FolderPluginLoader.php", "src/FolderPluginLoader/FolderPluginLoader.php");
127+
$phar->addFile($this->getFile() . "src/FolderPluginLoader/Main.php", "src/FolderPluginLoader/Main.php");
128+
129+
$phar->compressFiles(\Phar::GZ);
130+
$phar->stopBuffering();
131+
$sender->sendMessage("Folder plugin loader has been created on ".$pharPath);
132+
return true;
133+
}
134+
75135
private function makePluginCommand(CommandSender $sender, Command $command, $label, array $args){
76136
$pluginName = trim(implode(" ", $args));
77137
if($pluginName === "" or !(($plugin = Server::getInstance()->getPluginManager()->getPlugin($pluginName)) instanceof Plugin)){
@@ -99,7 +159,8 @@ private function makePluginCommand(CommandSender $sender, Command $command, $lab
99159
"depend" => $description->getDepend(),
100160
"description" => $description->getDescription(),
101161
"authors" => $description->getAuthors(),
102-
"website" => $description->getWebsite()
162+
"website" => $description->getWebsite(),
163+
"creationDate" => time()
103164
]);
104165
$phar->setStub('<?php echo "PocketMine-MP plugin '.$description->getName() .' v'.$description->getVersion().'\nThis file has been generated using DevTools v'.$this->getDescription()->getVersion().' at '.date("r").'\n----------------\n";if(extension_loaded("phar")){$phar = new \Phar(__FILE__);foreach($phar->getMetadata() as $key => $value){echo ucfirst($key).": ".(is_array($value) ? implode(", ", $value):$value)."\n";}} __HALT_COMPILER();');
105166
$phar->setSignatureAlgorithm(\Phar::SHA1);
@@ -124,7 +185,7 @@ private function makePluginCommand(CommandSender $sender, Command $command, $lab
124185

125186
private function makeServerCommand(CommandSender $sender, Command $command, $label, array $args){
126187
$server = Server::getInstance();
127-
$pharPath = $this->getDataFolder() . DIRECTORY_SEPARATOR . $server->getName().".phar";
188+
$pharPath = $this->getDataFolder() . DIRECTORY_SEPARATOR . $server->getName()."_".$server->getPocketMineVersion().".phar";
128189
if(file_exists($pharPath)){
129190
$sender->sendMessage("Phar file already exists, overwriting...");
130191
@unlink($pharPath);
@@ -135,7 +196,8 @@ private function makeServerCommand(CommandSender $sender, Command $command, $lab
135196
"version" => $server->getPocketMineVersion(),
136197
"api" => $server->getApiVersion(),
137198
"minecraft" => $server->getVersion(),
138-
"protocol" => Info::CURRENT_PROTOCOL
199+
"protocol" => Info::CURRENT_PROTOCOL,
200+
"creationDate" => time()
139201
]);
140202
$phar->setStub('<?php define("pocketmine\\\\PATH", "phar://". __FILE__ ."/"); require_once("phar://". __FILE__ ."/src/pocketmine/PocketMine.php"); __HALT_COMPILER();');
141203
$phar->setSignatureAlgorithm(\Phar::SHA1);

0 commit comments

Comments
 (0)