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.

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

Update Simplified Chinese #242

Closed
wants to merge 69 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
6dd8aae
Added BlockPalette, BlockQuery, WeightedRandom
inxomnyaa Dec 25, 2020
fb58e74
switch out Block[] with BlockPalette
inxomnyaa Dec 25, 2020
ae3500d
Use regex to reduce server load when parsing commands
inxomnyaa Dec 25, 2020
51be977
Remove unused leftovers
inxomnyaa Dec 25, 2020
7292315
🆗 phpstan, as you wish
inxomnyaa Dec 25, 2020
f5f1392
Add PHP8.0 support
inxomnyaa Feb 13, 2021
ded5dad
Schematics, Structures and exported Clipboards: unified as "Assets"
inxomnyaa Feb 13, 2021
994b127
Fix #222: Changed text colors for readability & consistency
inxomnyaa Feb 13, 2021
5e70a92
Whoopsie, the AssetCommand class slipped
inxomnyaa Feb 13, 2021
cbe446e
Upgrade libstructure
inxomnyaa Feb 13, 2021
b83f45d
Add clipboard to asset & asset settings form
inxomnyaa Feb 20, 2021
8cfdee7
Add asset placement, make scaffolding functional
inxomnyaa Feb 20, 2021
9dfe62f
Kind of fix placement offset
inxomnyaa Feb 20, 2021
6ed426c
Fixed asset placement
inxomnyaa Feb 20, 2021
9425317
Asset::toSchematic, place asset outline
inxomnyaa Mar 9, 2021
63d08bc
Minimal phpstan patches
inxomnyaa Mar 9, 2021
fa1c73a
Fix other phpstan issues
inxomnyaa Mar 9, 2021
7d03a80
pmmp removed hasTag
inxomnyaa Apr 17, 2021
b6b8ff1
Upgrade required libstructure version
inxomnyaa Apr 17, 2021
6e631ae
Change UUID to Ramsey\Uuid, Fix #223
inxomnyaa Apr 23, 2021
fc3a760
Update to PHP8
inxomnyaa Apr 23, 2021
582039b
test
inxomnyaa Apr 23, 2021
d413ae4
phpstan works again
inxomnyaa Apr 23, 2021
a7f90e4
phpstan is rart with array access on Ds\Map
inxomnyaa Apr 23, 2021
bd7de06
save
inxomnyaa Jun 3, 2021
4b1db34
Add missing null check in Scoreboard
inxomnyaa Jun 3, 2021
d6630e2
Merge branch 'assets' into palette-preview
inxomnyaa Jun 3, 2021
7a94dd4
Fix #231, improve getSession code
inxomnyaa Jul 18, 2021
a92278c
Add //togglesidebar, Fix #226
inxomnyaa Jul 18, 2021
79d6fba
[phpstan skip]
larryTheCoder Jul 20, 2021
e218eaf
Include PocketMine-MP.phar
larryTheCoder Jul 20, 2021
23ad659
Fix #232
inxomnyaa Jul 25, 2021
a801063
Add more null checks BlockStatesParser::getStateByBlock()
inxomnyaa Jul 25, 2021
9c1ad76
Move brushes, assets and palettes into collections
inxomnyaa Jul 25, 2021
2db269d
Replace getBlockArrayAt with getBlockFullId
inxomnyaa Jul 25, 2021
8e81784
Fix #228
inxomnyaa Jul 25, 2021
53d1c0f
Implement some PaletteCommand functionality
inxomnyaa Jul 25, 2021
4541909
Fix logic in PaletteCommand
inxomnyaa Jul 25, 2021
49386a6
Implement basic palette items + command functionality
inxomnyaa Jul 26, 2021
26c36d5
Add COMMANDS.MD, add setting for developer commands
inxomnyaa Jul 26, 2021
33dd946
Palette from selection
inxomnyaa Sep 30, 2021
cacedf7
getPos -> getPosition & minor cleanups
inxomnyaa Sep 23, 2021
1af1e6f
Use FormAPI virion
inxomnyaa Sep 30, 2021
31a6abb
Step 1 of migrating to FormAPI
inxomnyaa Oct 1, 2021
ff60f74
Fix //lang
inxomnyaa Oct 1, 2021
0ddf475
Fix palette, brush, asset command
inxomnyaa Oct 1, 2021
13bbaf9
Merge pull request #235 from thebigsmileXD/replace-customui
inxomnyaa Oct 1, 2021
d7fc6ef
Update ScoreFactory, Fix #233
inxomnyaa Oct 1, 2021
086d9ea
Fix brush creation form
inxomnyaa Oct 1, 2021
37cbe28
Fix editing brush extra properties
inxomnyaa Oct 1, 2021
f227351
Add outline test code
inxomnyaa Mar 9, 2021
f2fb87a
Add palette item to inventory after creation
inxomnyaa Oct 1, 2021
8e90792
Add BlockQuery::fromString(), implement palette modify option
inxomnyaa Oct 2, 2021
e651a1a
Update libstructure dependency
inxomnyaa Oct 3, 2021
c2d74a5
Remove redundant PHPDoc in UserSession
inxomnyaa Oct 3, 2021
2d2f2b2
Clear palettes & assets from inventory
inxomnyaa Oct 3, 2021
f7ca1ba
Update scoreboard on UserSession bool option change
inxomnyaa Oct 3, 2021
e89cedc
Outline is now mostly functional
inxomnyaa Oct 3, 2021
16fa1bd
Add ToggleOutlineCommand
inxomnyaa Oct 3, 2021
62351a3
Outline fully functional (#234), Added MWESelectionChangeEvent::TYPE_…
inxomnyaa Oct 3, 2021
ad4b97e
Update COMMANDS.MD
inxomnyaa Oct 4, 2021
b95ae3d
Update and restructure README.md
inxomnyaa Oct 4, 2021
630db9e
Fix #240 (crash on enabling outline without selection)
inxomnyaa Oct 11, 2021
d6a0719
Add Selection isValid check before creating outline
inxomnyaa Oct 11, 2021
f387e1c
API 4.0.0-BETA5
inxomnyaa Oct 11, 2021
576de87
Add API::positiveModulo()
inxomnyaa Oct 11, 2021
c204d05
Resend outline if chunks are out of view
inxomnyaa Oct 11, 2021
ddd0235
Updated Simplified Chinese Translation
dingyifei Oct 24, 2021
b48cabb
Update zho.ini
dingyifei Oct 24, 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
Prev Previous commit
Next Next commit
Add missing null check in Scoreboard
Signed-off-by: XenialDan <[email protected]>
inxomnyaa committed Jun 3, 2021
commit 4b1db3482bc2d5b111c8a30d9d758bd691a25203
10 changes: 8 additions & 2 deletions src/xenialdan/MagicWE2/helper/Scoreboard.php
Original file line number Diff line number Diff line change
@@ -31,7 +31,10 @@ public function handleScoreboard(UserSession $session): void
ScoreFactory::setScoreLine($player, ++$line, TF::GOLD . $session->getLanguage()->translateString("spacer", ["Selection"]));
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Position: " . TF::RESET . API::vecToString($selection->getPos1()->asVector3()) . " » " . API::vecToString($selection->getPos2()->asVector3()));
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " World: " . TF::RESET . $selection->getWorld()->getFolderName());
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Shape: " . TF::RESET . (new ReflectionClass($selection->shape))->getShortName());
if ($selection->shape === null)
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Shape: " . TF::RESET . 'N/A');
else
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Shape: " . TF::RESET . (new ReflectionClass($selection->shape))->getShortName());
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Size: " . TF::RESET . API::vecToString(new Vector3($selection->getSizeX(), $selection->getSizeY(), $selection->getSizeZ())) . " ({$selection->getShape()->getTotalCount()})");

ScoreFactory::setScoreLine($player, ++$line, TF::GOLD . $session->getLanguage()->translateString("spacer", ["Settings"]));
@@ -48,7 +51,10 @@ public function handleScoreboard(UserSession $session): void
if ($cb->customName !== "")
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Name: " . TF::RESET . $cb->customName);
if ($cb->selection instanceof Selection) {
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Shape: " . TF::RESET . (new ReflectionClass($cb->selection->shape))->getShortName());
if ($cb->selection->shape === null)
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Shape: " . TF::RESET . 'N/A');
else
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Shape: " . TF::RESET . (new ReflectionClass($cb->selection->shape))->getShortName());
ScoreFactory::setScoreLine($player, ++$line, TF::BOLD . " Size: " . TF::RESET . API::vecToString(new Vector3($cb->selection->getSizeX(), $cb->selection->getSizeY(), $cb->selection->getSizeZ())) . " ({$cb->getTotalCount()})");
}
}