Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update too old functions and fix a lot of bugs #75

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update too old functions and fix a lot of bugs #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
004802d
Fix Issue #73
supercrafter333 Feb 20, 2021
3036132
Update too old implode function and fix #73 better
supercrafter333 Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MapImageEngine/src/FaigerSYS/MapImageEngine/MapImageEngine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function onEnable() {

@mkdir($dir = $path . 'instructions/');
foreach (scandir($r_dir = $this->getFile() . '/resources/instructions/') as $file) {
if ($file{0} !== '.') {
if ($file[0] !== '.') {
copy($r_dir . $file, $dir . $file);
}
}
Expand Down
120 changes: 60 additions & 60 deletions MapImageEngine/src/FaigerSYS/MapImageEngine/command/MapImageEngineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@

class MapImageEngineCommand extends Command implements PluginIdentifiableCommand, Listener {

const MSG_PREFIX = CLR::BOLD . CLR::GOLD . '[' . CLR::RESET . CLR::GREEN . 'MIE' . CLR::BOLD . CLR::GOLD . ']' . CLR::RESET . CLR::GRAY . ' ';
const MSG_PREFIX = CLR::BOLD . CLR::GOLD . "[" . CLR::RESET . CLR::GREEN . "MIE" . CLR::BOLD . CLR::GOLD . "]" . CLR::RESET . CLR::GRAY . " ";

/** @var array */
private $cache = [];

public function __construct() {
$this->getPlugin()->getServer()->getPluginManager()->registerEvents($this, $this->getPlugin());

parent::__construct('mapimageengine', TS::translate('command.desc'), null, ['mie']);
$this->setPermission('mapimageengine');
parent::__construct("mapimageengine", TS::translate("command.desc"), null, ["mie"]);
$this->setPermission("mapimageengine");
}

public function execute(CommandSender $sender, string $label, array $args) {
Expand All @@ -44,71 +44,71 @@ public function execute(CommandSender $sender, string $label, array $args) {
}

if (!$sender instanceof Player) {
$sender->sendMessage(self::MSG_PREFIX . TS::translate('command.in-game'));
$sender->sendMessage(self::MSG_PREFIX . TS::translate("command.in-game"));
return;
}

$cmd = array_shift($args);
switch ($cmd) {
case 'list':
case "list":
$list = $this->getPlugin()->getImageStorage()->getNamedImages();
if (empty($list)) {
$sender->sendMessage(self::MSG_PREFIX . TS::translate('command.list.no-images'));
$sender->sendMessage(self::MSG_PREFIX . TS::translate("command.list.no-images"));
} else {
$new_list = [];
foreach ($list as $name => $image) {
$w = $image->getBlocksWidth();
$h = $image->getBlocksHeight();

$new_list[] = $name . CLR::RESET . ' ' . CLR::AQUA . '(' . CLR::DARK_GREEN . $w . CLR::AQUA . 'x'. CLR::DARK_GREEN . $h . CLR::AQUA . ')';
$new_list[] = $name . CLR::RESET . " " . CLR::AQUA . "(" . CLR::DARK_GREEN . $w . CLR::AQUA . "x". CLR::DARK_GREEN . $h . CLR::AQUA . ")";
}

$list = CLR::WHITE . CLR::ITALIC . implode($new_list, CLR::GRAY . ', ' . CLR::WHITE . CLR::ITALIC) . CLR::GRAY;
$sender->sendMessage(self::MSG_PREFIX . TS::translate('command.list') . $list);
$list = CLR::WHITE . CLR::ITALIC . implode(CLR::GRAY . ", " . CLR::WHITE . CLR::ITALIC, $new_list) . CLR::GRAY;
$sender->sendMessage(self::MSG_PREFIX . TS::translate("command.list") . $list);
}
break;

case 'place':
case "place":
$image_name = (string) array_shift($args);
if (!strlen($image_name)) {
$sender->sendMessage(self::MSG_PREFIX . TS::translate('command.usage') . '/' . $label . ' place ' . TS::translate('command.place.usage'));
$sender->sendMessage(CLR::GRAY . TS::translate('command.place.usage.flags'));
$sender->sendMessage(CLR::GRAY . ' pretty - ' . TS::translate('command.place.usage.flags.pretty'));
$sender->sendMessage(CLR::GRAY . ' auto - ' . TS::translate('command.place.usage.flags.auto'));
$sender->sendMessage(self::MSG_PREFIX . TS::translate("command.usage") . "/" . $label . " place " . TS::translate("command.place.usage"));
$sender->sendMessage(CLR::GRAY . TS::translate("command.place.usage.flags"));
$sender->sendMessage(CLR::GRAY . " pretty - " . TS::translate("command.place.usage.flags.pretty"));
$sender->sendMessage(CLR::GRAY . " auto - " . TS::translate("command.place.usage.flags.auto"));
} else {
$image = $this->getPlugin()->getImageStorage()->getImageByName($image_name);
if (!$image) {
$sender->sendMessage(self::MSG_PREFIX . TS::translate('command.place.not-found', $image_name));
$sender->sendMessage(self::MSG_PREFIX . TS::translate("command.place.not-found", $image_name));
} else {
$this->cache[$sender->getName()] = [
'image_hash' => $image->getHashedUUID(),
'pretty' => in_array('pretty', $args),
'auto' => in_array('auto', $args),
'placed' => 0,
'x_count' => $image->getBlocksWidth(),
'y_count' => $image->getBlocksHeight()
"image_hash" => $image->getHashedUUID(),
"pretty" => in_array("pretty", $args),
"auto" => in_array("auto", $args),
"placed" => 0,
"x_count" => $image->getBlocksWidth(),
"y_count" => $image->getBlocksHeight()
];

$this->processPlaceMessage($sender);
}
}
break;

case 'exit':
case "exit":
$name = $sender->getName();
if (isset($this->cache[$name])) {
unset($this->cache[$name]);
$sender->sendMessage(self::MSG_PREFIX . TS::translate('command.exit'));
$sender->sendMessage(self::MSG_PREFIX . TS::translate("command.exit"));
} else {
$sender->sendMessage(self::MSG_PREFIX . TS::translate('command.exit.not-allowed'));
$sender->sendMessage(self::MSG_PREFIX . TS::translate("command.exit.not-allowed"));
}
break;

default:
$sender->sendMessage(self::MSG_PREFIX . TS::translate('command.usage'));
$sender->sendMessage(CLR::GRAY . ' /' . $label . ' list - ' . TS::translate('command.desc.list'));
$sender->sendMessage(CLR::GRAY . ' /' . $label . ' place - ' . TS::translate('command.desc.place'));
$sender->sendMessage(CLR::GRAY . ' /' . $label . ' exit - ' . TS::translate('command.desc.exit'));
$sender->sendMessage(self::MSG_PREFIX . TS::translate("command.usage"));
$sender->sendMessage(CLR::GRAY . " /" . $label . " list - " . TS::translate("command.desc.list"));
$sender->sendMessage(CLR::GRAY . " /" . $label . " place - " . TS::translate("command.desc.place"));
$sender->sendMessage(CLR::GRAY . " /" . $label . " exit - " . TS::translate("command.desc.exit"));
}
}

Expand All @@ -130,16 +130,16 @@ public function onTouch(PlayerInteractEvent $e) {

$frame = $level->getTile($block);
if (!($frame instanceof ItemFrame)) {
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.not-frame'));
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.not-frame"));
} else {
$data = &$this->cache[$name];

if ($data['auto']) {
if (!isset($data['p1'])) {
$data['p1'] = $block;
if ($data["auto"]) {
if (!isset($data["p1"])) {
$data["p1"] = $block;
$this->processPlaceMessage($player);
} else {
$p1 = $data['p1'];
$p1 = $data["p1"];
$p2 = $block;

$x1 = $p1->getX();
Expand All @@ -150,9 +150,9 @@ public function onTouch(PlayerInteractEvent $e) {
$z2 = $p2->getZ();

if ($y1 < $y2) {
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.invalid-upper-corner'));
} else if ($y1 - $y2 + 1 !== $data['y_count']) {
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.height-not-match'));
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.invalid-upper-corner"));
} else if ($y1 - $y2 + 1 !== $data["y_count"]) {
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.height-not-match"));
} else {
$x = $x1;
$z = $z1;
Expand All @@ -166,11 +166,11 @@ public function onTouch(PlayerInteractEvent $e) {
$from = $x1;
$to = $x2;
} else {
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.not-flat'));
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.not-flat"));
}

if (abs($to - $from) + 1 !== $data['x_count']) {
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.width-not-match'));
if (abs($to - $from) + 1 !== $data["x_count"]) {
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.width-not-match"));
} else if ($a !== null) {
$x_b = -1;
for ($a = $from; $from < $to ? $a <= $to : $a >= $to; $from < $to ? $a++ : $a--) {
Expand All @@ -181,33 +181,33 @@ public function onTouch(PlayerInteractEvent $e) {

$frame = $level->getTile(new Vector3($x, $y, $z));
if (!($frame instanceof ItemFrame)) {
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.no-frames'));
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.no-frames"));
break 2;
}

$map = new FilledMap();
$map->setImageData($data['image_hash'], $x_b, $y_b);
$map->setImageData($data["image_hash"], $x_b, $y_b);

$frame->setItem($map);
}
}
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.success'));
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.success"));
}
}

unset($this->cache[$name]);
}
} else {
$x = $data['placed'] % $data['x_count'];
$y = floor($data['placed'] / $data['x_count']);
$x = $data["placed"] % $data["x_count"];
$y = floor($data["placed"] / $data["x_count"]);

$map = new FilledMap();
$map->setImageData($data['image_hash'], $x, $y);
$map->setImageData($data["image_hash"], $x, $y);

$frame->setItem($map);

if (++$data['placed'] === ($data['x_count'] * $data['y_count'])) {
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.success'));
if (++$data["placed"] === ($data["x_count"] * $data["y_count"])) {
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.success"));
unset($this->cache[$name]);
} else {
$this->processPlaceMessage($player);
Expand All @@ -227,35 +227,35 @@ private function processPlaceMessage(Player $player) {
$name = $player->getName();
$data = &$this->cache[$name];

$player->sendMessage('');
$player->sendMessage(self::MSG_PREFIX . TS::translate('command.place.placing'));
$player->sendMessage("");
$player->sendMessage(self::MSG_PREFIX . TS::translate("command.place.placing"));

if ($data['auto']) {
if (!isset($data['p1'])) {
$player->sendMessage(CLR::GRAY . TS::translate('command.place.click-top-left'));
if ($data["auto"]) {
if (!isset($data["p1"])) {
$player->sendMessage(CLR::GRAY . TS::translate("command.place.click-top-left"));
} else {
$player->sendMessage(CLR::GRAY . TS::translate('command.place.click-bottom-right'));
$player->sendMessage(CLR::GRAY . TS::translate("command.place.click-bottom-right"));
}
} else {
$player->sendMessage(CLR::GRAY . TS::translate('command.place.placing-info'));
$player->sendMessage(CLR::GRAY . TS::translate("command.place.placing-info"));

$x = (int) $data['placed'] % $data['x_count'];
$y = (int) ($data['placed'] / $data['x_count']);
$x = (int) $data["placed"] % $data["x_count"];
$y = (int) ($data["placed"] / $data["x_count"]);

if ($data['pretty']) {
if ($data["pretty"]) {
$block = "\xe2\xac\x9b";

for ($y_b = 0; $y_b < $data['y_count']; $y_b++) {
for ($y_b = 0; $y_b < $data["y_count"]; $y_b++) {
$line = CLR::WHITE;
for ($x_b = 0; $x_b < $data['x_count']; $x_b++) {
for ($x_b = 0; $x_b < $data["x_count"]; $x_b++) {
$line .= ($x_b === $x && $y_b === $y) ? CLR::GREEN . $block . CLR::WHITE : $block;
}

$player->sendMessage($line);
}
}

$player->sendMessage(CLR::GRAY . TS::translate('command.place.click', $x + 1, $y + 1));
$player->sendMessage(CLR::GRAY . TS::translate("command.place.click", $x + 1, $y + 1));
}
}

Expand Down