Update Simplified Chinese

.github/workflows/main.yml

@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   phpstan:
+    if: "!contains(github.event.head_commit.message, '[phpstan skip]')"
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

.poggit.yml

@@ -11,23 +11,23 @@ projects:
       phpstan: false
     libs:
       - src: BlockHorizons/libschematic/libschematic
-        version: ^2.0.0
-      - src: thebigsmilexd/customui/customui
-        version: ^4.0.0
-        branch: PM4
+        version: ^2.0.1
+      - src: WolvesFortress/FormAPI/libFormAPI
+        version: ^1.3.0
+        branch: pm4
       - src: thebigsmilexd/apibossbar/apibossbar
-        version: ^0.1.3
+        version: ^0.1.4
         branch: PM4
       - src: CortexPE/Commando/Commando
         version: ^3.0.0
         branch: PM4
       - src: muqsit/invmenu/InvMenu
-        version: ^4.0.1
+        version: ^4.1.0
         branch: "4.0"
       - src: thebigsmilexd/libstructure/libstructure
-        version: ^0.1.1
+        version: ^0.1.5
         branch: mcstructure
-      - src: buchwasa/ScoreFactory/ScoreFactory
+      - src: buchwasa/scorefactory/ScoreFactory
         version: ^3.0.1
         branch: pm4
 ...

COMMANDS.MD

@@ -0,0 +1,52 @@
+# Commands
+This list is automatically generated. If you have noticed an error, please create an issue.
+
+| Command | Description | Usage | Alias |
+|---|---|---|---|
+| `//pos1` | Set position 1 | `//pos1 ` | `//1` |
+| `//pos2` | Set position 2 | `//pos2 ` | `//2` |
+| `//hpos1` | Set position 1 to targeted block | `//hpos1 ` | `//h1` |
+| `//hpos2` | Set position 2 to targeted block | `//hpos2 ` | `//h2` |
+| `//chunk` | Set the selection to your current chunk | `//chunk ` |  |
+| `//wand` | Gives you the selection wand | `//wand ` |  |
+| `//togglewand` | Toggle the wand tool on/off | `//togglewand ` | `//toggleeditwand` |
+| `//debug` | Gives you the debug stick, which gives information about the clicked block | `//debug ` |  |
+| `//toggledebug` | Toggle the debug stick on/off | `//toggledebug ` |  |
+| `//size` | Get information about the selection | `//size ` |  |
+| `//count` | Counts the number of blocks matching a mask in selection | `//count [blocks:string] [flags:text]` | `//analyze` |
+| `//listchunks` | List chunks that your selection includes | `//listchunks ` |  |
+| `//set` | Fill a selection with the specified blocks | `//set <blocks:string> [flags:text]` |  |
+| `//replace` | Replace blocks in an area with other blocks | `//replace <findblocks:string> <replaceblocks:string> [flags:text]` |  |
+| `//cylinder` | Create a cylinder | `//cylinder <blocks:string> <diameter:int> [height:int] [flags:text]` | `//cyl` |
+| `//copy` | Copy the selection to the clipboard | `//copy [flags:text]` |  |
+| `//paste` | Paste the clipboard's contents | `//paste [flags:text]` |  |
+| `//cut` | Cut the selection to the clipboard | `//cut [flags:text]` |  |
+| `//cut2` | Cut the selection to the clipboard - the new way | `//cut2 [flags:text]` |  |
+| `//clearclipboard` | Clear your clipboard | `//clearclipboard ` |  |
+| `//flip` | Flip the contents of the clipboard across the origin | `//flip <axis:string>` | `//mirror` |
+| `//rotate` | Rotate the contents of the clipboard around the origin | `//rotate <angle:int> [aroundOrigin:bool]` |  |
+| `//undo` | Rolls back the last action | `//undo ` |  |
+| `//redo` | Applies the last undo action again | `//redo ` |  |
+| `//clearhistory` | Clear your history | `//clearhistory ` |  |
+| `//setrange` | Set tool range | `//setrange [range:int]` | `//toolrange` |
+| `//limit` | Set the block change limit. Use -1 to disable | `//limit [limit:int]` |  |
+| `//help` | MagicWE help command | `//help [command:string]` | `//?, //mwe, //wehelp` |
+| `//version` | MagicWE version | `//version ` | `//ver` |
+| `//info` | Information about MagicWE | `//info ` |  |
+| `//report` | Report a bug to GitHub | `//report [title:text]` | `//bug, //github` |
+| `//donate` | Donate to support development of MagicWE! | `//donate ` | `//support, //paypal` |
+| `//language` | Set your language | `//language [language:string]` | `//lang` |
+| `//biomelist` | Gets all biomes available | `//biomelist ` | `//biomels` |
+| `//biomeinfo` | Get the biome of the targeted block | `//biomeinfo [flags:text]` |  |
+| `//setbiome` | Sets the biome of your current block or region | `//setbiome <biome:int>` |  |
+| `//calculate` | Evaluate a mathematical expression | `//calculate <expression:text>` | `//calc, //eval, //evaluate, //solve` |
+| `//togglewaila` | Toggle the What Am I Looking At utility | `//togglewaila ` | `//waila, //wyla` |
+| `//togglesidebar` | Toggle the sidebar | `//togglesidebar ` | `//sidebar` |
+| `//toggleoutline` | Toggle the selection outline | `//toggleoutline ` | `//outline, //showbounds` |
+| `//placeallblockstates` | Place all blockstates similar to Java debug worlds | `//placeallblockstates ` |  |
+| `//testapi` | Internal command for testing API methods | `//testapi ` |  |
+| `//generatecommandsmd` | Generates the commands.md file | `//generatecommandsmd ` |  |
+| `//brush` | Opens the brush tool menu | `//brush` |  |
+| `//brush name` | Get name or rename a brush | `/brush name [name:string]` |  |
+| `//palette` | Manage block palettes | `//palette ` |  |
+| `//flood` | Opens the flood fill tool menu | `//flood ` | `//floodfill` |

README.md

@@ -1,71 +1,58 @@
 ![MagicWE2's awesome wide banner!](https://github.com/thebigsmileXD/MagicWE2/blob/master/resources/magicwe_icon_wide.png)
 ---
-# MagicWE2
-Lag free asynchronous world editor for [PMMP](https://github.com/pmmp/PocketMine-MP)
 
-Try the new MagicWE, now way more powerful, with more support, more commands, new tools and more!
+# MagicWE2
 
-[![Poggit-CI](https://poggit.pmmp.io/ci.badge/thebigsmileXD/MagicWE2/MagicWE2/master)](https://poggit.pmmp.io/ci/thebigsmileXD/MagicWE2)
+<!--[![Poggit-CI](https://poggit.pmmp.io/ci.badge/thebigsmileXD/MagicWE2/MagicWE2/master)](https://poggit.pmmp.io/ci/thebigsmileXD/MagicWE2)
 [![](https://poggit.pmmp.io/shield.state/MagicWE2)](https://poggit.pmmp.io/p/MagicWE2)
-[![](https://poggit.pmmp.io/shield.api/MagicWE2)](https://poggit.pmmp.io/p/MagicWE2)
-![PHPStan](https://github.com/thebigsmileXD/MagicWE2/workflows/PHPStan/badge.svg)
-## Why MagicWE2?
-_Rainbow sprinkles!_
+[![](https://poggit.pmmp.io/shield.api/MagicWE2)](https://poggit.pmmp.io/p/MagicWE2)-->
+[![PHPStan](https://github.com/thebigsmileXD/MagicWE2/workflows/PHPStan/badge.svg)](https://github.com/thebigsmileXD/MagicWE2/workflows/PHPStan)
+[![Donations Badge](https://raw.githubusercontent.com/k4m4/donations/master/images/badge.svg)](https://paypal.me/xenialdan)
 
-Jokes aside, here is a list of pros:
+Lag free asynchronous world editor for [PMMP](https://github.com/pmmp/PocketMine-MP) with focus on mobile usability
+
+## Features
 
 - Simple usage
+- Asynchronous world editing
+- Strong focus on simplicity
 - Translations
 - Good performance and great speeds
-- Progress bars like on Windows 98!
-- Sessions
+- Many commands
+- Progress bars
+- Cached sessions
 - Clipboards
-- Optimized item / block parsing - you can place any block, by id, name, and item!
-- Alot more commands
-- Command auto-completion
-- Command flags (i.e. -p for relative copying/pasting, -h for hollow objects)
-- UI for brush setup and configuration
-- Fancy icon and optional startup ASCII art
-- Direct bug reporting to GitHub
+- Optimized item / block parsing - you can place any block, by id, name, item and even blockstates
+- Command auto-completion (broken, [#blameMojang (Jira Issue)](https://bugs.mojang.com/browse/MCPE-138567))
+- Command specific flags (i.e. -p for relative copying/pasting, -h for hollow objects)
+- UIs for brushes, palettes, assets etc.
+- Selection shapes & outline
+- Simplified placement of assets
+- Previews of selections / structures
+- Scoreboard integration
+- Feature rich API
+- Prefilled bug report issue url using `//report`
+
 <!-- 
 - schematic support
 - MyPlot support
 -->
 
 ## Commands
-| Command | Alias | Description | Usage |
-| --- | --- | --- | --- |
-| `//pos1` | `//1` | `Select first position` | `//pos1` |
-| `//pos2` | `//2` | `Select second position` | `//pos2` |
-| `//set` | `//fill` | `Fill an area with the specified blocks` | `//set <blocks:string> [flags:text]` |
-| `//replace` | | `Replace blocks in an area with other blocks` | `//replace <findblocks:string> <replaceblocks:string> [flags:text]` |
-| `//copy` | | `Copy an area into a clipboard` | `//copy [flags:text]` |
-| `//paste` |  | `Paste your clipboard` | `//paste [flags:text]` |
-| `//wand` |  | `Gives you the selection wand` | `//wand` |
-| `//togglewand` |  | `Toggle the wand tool on/off` | `//togglewand` |
-| `//undo` |  | `Rolls back the last action` | `//undo` |
-| `//redo` |  | `Applies the last undo action again` | `//redo` |
-| `//debug` |  | `Gives you the debug stick, which gives information about the clicked block` | `//debug` |
-| `//toggledebug` |  | `Toggle the debug stick on/off` | `//toggledebug` |
-| `//cylinder` | `//cyl` | `Create a cylinder` | `//cylinder <blocks:string> <diameter:int> [height:int] [flags:text]` |
-| `//count` | `//analyze` | `Count blocks in selection` | `//count [blocks:string] [flags:text]` |
-| `//help` | `//?,//mwe,//wehelp` | `MagicWE help command` | `//help [command:string]` |
-| `//version` | `//ver` | `MagicWE version` | `//version` |
-| `//info` |  | `Information about MagicWE` | `//info` |
-| `//report` | `//bug,//github` | `Report a bug to GitHub` | `//report [title:text]` |
-| `//donate` | `//support,//paypal` | `Donate to support development of MagicWE!` | `//donate` |
-| `//brush` |  | `Opens the brush tool menu` | `//brush` |
-| `//flood` |  | `Opens the flood tool menu` | `//flood` |
+<!-- TODO change to master branch -->
+You can find a list of commands here: [COMMANDS.MD](https://github.com/thebigsmileXD/MagicWE2/blob/outline/COMMANDS.MD)
 
 ## Planned features
-- Saved sessions (saved brushes and clipboards)
-- More commands, a glimpse at the plugin.yml should give you a good look what is coming up
-- Command based flags, since they are currently in a global state
-- Schematic and structure block data support
+
+- More saved session data (saved brushes, clipboards, palettes)
+- More commands
+- Per-command flags, since they are currently in a global state
+- Schematic and structure block data support (in progress)
 - Clipboard naming, exporting and switching
-- ScoreboardAPI integration
-- Better and more brushes. For now i suggest using [BlockSniper](https://github.com/BlockHorizons/BlockSniper) for brushes!
+- Better and more brushes. For now i suggest using [BlockSniper](https://github.com/BlockHorizons/BlockSniper) for
+  brushes!
 - [MyPlot](https://github.com/jasonwynn10/MyPlot) integration
+- UI with edit history
 
 ## Fast updates
 You have an urgent issue, your server is crashing or players mess with the world and start griefing?
@@ -77,9 +64,12 @@ Feel free to open issues, feature requests and criticism are welcome!
 If you have an urgent issue, tag me on Twitter for faster response time: [@xenialdan](https://twitter.com/xenialdan)
 
 ## Quotes
-- _"MagicWE2 has a new fresh coating over the plugin, with rainbow colored sprinkle topping!"_ ~ XenialDan, 2017
+
+- _"MagicWE2 has a new fresh coating over the plugin, with rainbow colored sprinkle topping!"_
+- _"MWE2 - Not to be confused with MewTwo"_
 
 ### Foot notes
+
 License: GNU GENERAL PUBLIC LICENSE
 
-Readme last updated: 4th August 2019
+Readme last updated: 4th October 2021

phpstan.neon.dist

@@ -11,12 +11,14 @@ parameters:
         - phar:///pocketmine/PocketMine-MP.phar/vendor/autoload.php
     scanDirectories:
         - /source/src
-        - phar:///source/vendor/customui.phar/src
+        - /source/vendor
+        - phar:///source/vendor/libFormAPI.phar/src
         - phar:///source/vendor/apibossbar.phar/src
         - phar:///source/vendor/Commando.phar/src
         - phar:///source/vendor/libschematic.phar/src
         - phar:///source/vendor/InvMenu.phar/src
         - phar:///source/vendor/libstructure.phar/src
         - phar:///source/vendor/ScoreFactory.phar/src
+        - phar:///pocketmine/PocketMine-MP.phar
     excludes_analyse:
-        - source/vendor
+        - source/vendor

plugin.yml

@@ -1,9 +1,10 @@
 ---
 name: MagicWE2
 main: xenialdan\MagicWE2\Loader
-version: 10.1.2
+version: 10.1.8
 api: ["4.0.0"]
-php: "7.4"
+php: [ "8.0" ]
+softdepend: [ "DEVirion" ]
 authors:
   - XenialDan
 description: Lag free asynchronous world editor for PMMP with plenty of options
@@ -18,6 +19,10 @@ permissions:
     default: op
   we.command.donate:
     default: true
+  we.command.asset:
+    default: op
+  we.command.palette:
+    default: op
   we.command.language:
     default: op
   we.command.help:
@@ -112,6 +117,10 @@ permissions:
     default: op
   we.command.utility.togglewaila:
     default: op
-  we.command.test:
+  we.command.utility.togglesidebar:
+    default: op
+  we.command.utility.toggleoutline:
+    default: op
+  we.command.debug:
     default: op
 ...

resources/config.yml

@@ -4,6 +4,9 @@
 # Available languages (ISO639-2):
 # eng, ara, cat, ces, chi, dan, deu, ell, epo, esp, est, fre, geo, hin, ind, ita, jpn, kor, lit, mar, mas, nld, nor, pol, por, rom, rus, slo, swa, swe, tgl, tha, zho
 language: eng
-show-startup-icon: false
+# Enables special commands for testing API features
+developer-commands: false
+# Maximum amount of blocks that can be edited at once. Set to -1 to disable
 limit: -1
+# Maximum raytraced distance for ranged tools. Default 100
 tool-range: 100

resources/lang/zho.ini

@@ -1,4 +1,4 @@
-; Updated time : 3rd 10  2019
+; Updated time : 23rd 10  2021
 ; See: https://www.loc.gov/standards/iso639-2/php/English_list.php
 language.name="Simplified Chinese"
 ; general
@@ -18,9 +18,9 @@ error.limitexceeded="您正在尝试修改的方块太多了。减少选择的
 error.notarget="找不到目标方块。如果需要，使用//setrange增加工具范围"
 error.noselection="找不到选中 - 请先选中一个范围"
 error.selectioninvalid="选中范围无效！检查是否已设置所有位置！"
-error.nosession="为创建会话 - 可能没有使用{%0}的权限"
+error.nosession="未创建会话 - 可能没有使用{%0}的权限"
 error.noclipboard = "找不到剪贴板 - 请先创建一个剪贴板"
-warning.differentworld = "[警告] 您的编辑不处于您目前所在世界！"
+warning.differentworld = "[警告] 您目前所在的世界不是您正在编辑的世界！"
 ; commands
 command.info.title="信息"
 command.limit.current="目前极限：{%0}"
@@ -84,6 +84,12 @@ tool.debug.lore.2="例如方块的名称和损耗值"
 tool.debug.lore.3="使用//toggledebug切换其功能"
 tool.debug.disabled="故障排除工具已禁用。使用//toggledebug来重新启用它"
 tool.debug.setenabled = "故障排除工具已{%0}！"
+; WAILA tool (What am i looking at)
+tool.waila = "Waila"
+tool.waila.setenabled = "Waila工具已{%0}！"
+; Sidebar
+tool.sidebar = "侧边栏"
+tool.sidebar.setenabled = "侧边栏已{%0}!"
 ; flood tool
 ui.flood.title="覆盖菜单"
 ui.flood.options.limit="最大方块数"

resources/parsepoggit.php

@@ -16,7 +16,7 @@
 		$version = $lib["version"] ?? "*";
 		$branch = $lib["branch"] ?? ":default";
 
-		$urls[] = "https://poggit.pmmp.io/v.dl/{$src}/{$version}?branch={$branch}";
+		$urls[] = "https://poggit.pmmp.io/v.dl/$src/$version?branch=$branch";
 	}
 }