Commit Graph

64 Commits

Author SHA1 Message Date
5e534ff9e2 Finalize Captions
Follow up to a9d1202ce1
2021-04-05 19:54:49 +02:00
ac16c9a2ba Minor upstream merge 2021-02-03 23:08:39 +01:00
0ee1321546 Add missing permissions 2020-11-13 21:08:57 +01:00
428f8e201d Upstream changes (#717)
* Perform part of the move of //fast to //perf (#1377)

This re-adds a deprecated `//fast` and moves the current logic to
`//perf`. Later `//perf` will have its syntax reworked, when Piston
finally supports sub-commands properly!

* Names via Translation (#1268)

* Deprecate BiomeRegistry, etc.

* Update some libraries, e.g. text

* Move to new translation renderer

* Revert "Deprecate BiomeRegistry, etc."

This reverts commit 59a5d6c92aec52739a8dc68ac3d23898af7593dd.

This was not a good idea for potential mod shenanigans.

* Move BiomeData#getName to BiomeRegistry, use i18n

* Use getRichName instead of getName

* Implement getRichName for NullBiomeRegistry

* Add getRichName for blocks

* Relocate net.kyori.minecraft

* Update adapters for getRichBlockName

* Add getRichName for items

* Update adapters for getRichItemName

* Update adapters JAR for merge

(cherry picked from commit cfd26253b6fb59ff6c65a0157a6780be7db4ea5a)

* Follow-up fixes for 92f877679622a27b16b9e5cd61cfec1a6545be33

* Don't send deprecation warning and improve info message

* Fix click command for perf box

(cherry picked from commit 7ee60060c31df2f8b41212b430a0875312189339)

* update R3 adapter§

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
Co-authored-by: Aurora <aurora@relanet.eu>
2020-11-09 10:38:10 +01:00
96dcb95b7c Javadoc and Formatting fixes. (#619)
Javadoc and Formatting fixes.

Also, extremely minor code changes which have been tested.
This commit is only part one of two commits that aim to fix problems with formatting in our project. In part two I will modify the Google Java Style Guide (since it closely matches our code style) for our project so there is guidance on how to format and document. 

* Updated PlotSquared URL
* Removed plugin acronyms
* Fixed a typo
* Fixed grammar
* Use modern block id's
* Update YouTube video URL
2020-10-05 13:41:41 -04:00
02886b0387 Updated the WorldEdit license using find and replace 2020-08-24 21:31:47 -04:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
7b9a64e9a6 add a bunch of // aliases for commands 2020-04-19 11:43:30 +01:00
1d562c7cc3 Fixing wrong translation keys 2020-03-29 12:41:10 +02:00
0c85db920c save strings.json 2019-11-21 20:37:56 +00:00
1341e38a90 fix compile 2019-11-21 19:56:10 +00:00
59b8465493 Merge remote-tracking branch 'upstream/feature/translatable-text' int… 2019-11-21 13:50:28 +00:00
66744bfaa4 Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge 2019-11-21 13:50:05 +00:00
5d8adbc10c Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:25:36 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
4ba54c4337 Further translations 2019-11-16 22:45:36 +10:00
96e56bdd0c Rebase translation work for easier rebasing 2019-11-16 22:42:14 +10:00
e32bc6db4a Use enum type for scoll actions 2019-10-23 15:44:13 +01:00
2080e9786b commanding-pipeline diff 2019-10-23 05:23:52 +01:00
da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
11d30d2f94 Disabled FAWE commands until the plugin can actually set a block again 2019-10-07 15:09:52 -04:00
0767f56711 Update to Piston 0.5.2 + Doctools/Deprecation improvements (#523)
* Update to Piston 0.5.2

* [Doctools] Fix output, be verbose about deprecations

* Improve deprecation system, doctools output

(cherry picked from commit 03c0cce53e)
2019-10-07 12:57:47 -04:00
03c0cce53e Update to Piston 0.5.2 + Doctools/Deprecation improvements (#523)
* Update to Piston 0.5.2

* [Doctools] Fix output, be verbose about deprecations

* Improve deprecation system, doctools output
2019-10-05 19:06:18 +10:00
ba26d788af Add /brush none and unbind aliases 2019-09-09 18:13:57 -07:00
0e9fee3b60 Add /tool back, deprecate global tool commands 2019-09-08 17:46:29 -07:00
c65e06cb1b Removed tool command 2019-09-03 15:40:59 -04:00
cafb4120ef More upstream compatibility fixes 2019-09-03 15:21:53 -04:00
68eea925e1 update adapter and platform manager 2019-08-29 13:57:03 +01:00
92fb90de09 Fix some arguments 2019-08-07 06:18:44 +10:00
6631b6bdf0 Make BlockStateHolder extend Pattern.
Removes the need for wrapping them in BlockPattern.
2019-07-28 18:20:00 -04:00
ff5860113d It started on work with commands then I got carried away. 2019-07-25 14:44:10 -04:00
905fbf5a0b 8108d0a9 2019-07-18 02:31:13 +10:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
a2b3aabbbf Typo fixes and command clarifications/cleanup.
Also re-disable the gradle daemon. It doesn't always play nice with
ForgeGradle and hogs ram.
2019-07-04 19:28:42 -04:00
1d1c38887f Added worldedit.setwand permission required to change wand/navwand.
Players without this perm will be stuck with the configuration-defined
default wand/navwand items.
2019-06-29 14:15:58 -04:00
6be77451b6 Correct perms for nav wand binding. 2019-06-29 13:55:58 -04:00
c0f2557f15 Make the selection wand and navigation wand normal tools. (#493)
This means users can bind and unbind them to any item, like other tools.
By default, the items in config will be automatically bound. After
setting a different item via `//selwand` or `//navwand`, that item will
subsequently be used for that user.

Also add -n to //wand to get a navwand.

Also various other tool-related cleanup.
2019-06-28 15:45:16 -04:00
ec001b8d3b Revert "Upstream, generics, formatting"
This reverts commit cd88e513a8.
2019-06-12 15:45:41 +02:00
cd88e513a8 Upstream, generics, formatting 2019-06-11 20:31:56 -04:00
b1c042b196 Add checkstyle validation for formatting, fix issues 2019-04-29 22:40:32 -07:00
8c2b725f42 Port toll / tool util commands, add more enums 2019-04-25 12:49:03 -07:00
be5541b61b revert some changes 2019-04-05 15:48:41 +11:00
1beea3cd22 Some more upstream merge 2019-04-04 21:28:41 +11:00
f361619037 Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11:00
1934006d14 Better enforce the Request lifetime.
Previously, the current request would just get a new EditSession when
one was created. Now, a Request is reset before and after:
 - a command is used and
 - an interact is fired with the platform
This means each action taken will get a single, non-reusable Request.

Note that this only applies to actions taken through the platform.
API users will not be using requests anyway, since things like Masks,
etc. will be constructed directly instead of being passed through the
platform's parsers and so on. (e.g. if a plugin loads a schematic into
the world with a mask, they should create the EditSession and mask it
directly, and not use that Mask again for another EditSession in another
World).

Also, get rid of a bunch of (some now-)unnecessary EditSession creation
during command dispatching.

Note that this also fixed the dynamic selection mask, which apparently
has been broken for some unknown amount of time.
2019-03-20 19:13:54 -04:00
dddf2b963a Fix long-range build tool.
Blocks were always placed around 0,0,0 since the trace direction was being used as a position.
Also the message was backwards.
2019-02-03 19:27:30 -05:00
628c9cc0b7 Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block. 2019-01-10 09:54:21 -05:00
76a55b7712 Merge remote-tracking branch 'refs/remotes/sk89q/master'
# Conflicts:

#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
#	worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
2018-08-14 01:36:00 +10:00
e0e7778536 Fixed some bugs and cleanup some code. 2018-08-13 22:18:12 +10:00
e7c27b08bf Remove stub injector methods 2018-08-13 02:36:39 +10:00