Commit Graph

53 Commits

Author SHA1 Message Date
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
d00899e177 More support for 3D biomes (#608)
* More support for 3D biomes

* Resolved merge conflicts
2020-09-12 15:31:42 +02: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
8078cf077a consistency changes 2020-01-26 13:01:16 -05:00
9efdd886c5 Fix translate args 2019-12-25 02:34:20 +00:00
0c85db920c save strings.json 2019-11-21 20:37:56 +00:00
1341e38a90 fix compile 2019-11-21 19:56:10 +00:00
66744bfaa4 Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge 2019-11-21 13:50:05 +00:00
37b6c406ac reduce diff 2019-11-21 07:57:32 +00:00
60759934a3 Fix some merge issues 2019-11-20 00:11:54 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
9a01bf9ab2 When custom files are found, use the base files for default values. 2019-11-16 22:46:31 +10:00
4ba54c4337 Further translations 2019-11-16 22:45:36 +10:00
0e6037584f Remove support for pluralisation to match Minecraft and alleviate issues with over-complexity 2019-11-16 22:43:23 +10:00
96e56bdd0c Rebase translation work for easier rebasing 2019-11-16 22:42:14 +10:00
8768085479 schem list is still broken
clickEvent and hoverEvent don't seem to work, I'm probably doing something wrong
2019-10-23 15:35:04 +01:00
da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
14ed3f1d9c Remove FawePlayer and API modifications 2019-09-13 23:05:16 -04:00
a3c58a187e merge 2019-08-07 01:29:09 +10:00
8545417b3a Fix error in /up when used out of bounds.
Also reduce calls to Entity#getLocation() all over since it's
more expensive than it needs to be (adapts world/vector every time).
2019-07-23 22:16:26 -04:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
58c6b6278f a69b239848 2019-06-29 04:20:48 +10:00
a69b239848 Upstream 2019-06-25 13:07:47 -04:00
753b34ef99 Cleaned commands and extents a bit. 2019-06-23 14:00:22 -04:00
b42553116c Removal of many prefixes and deprecation of FaweLocation
- Removed some prefixes to help make upstream merging a bit easier.
- Replaced reflection code for titles with the regular bukkit api.
- Removed FAWELocation and FAWEPlayer where it wasn't needed.
- Deprecated FaweLocation since having it in the first place is very stupid.
- FAWEPlayer should also be deprecated soon because the majority of that code is redundant.
2019-06-05 21:28:02 -04:00
9099a17fe5 Some command refactoring. Switch usages of page args to -p flag. 2019-06-01 07:04:07 -04:00
b1c042b196 Add checkstyle validation for formatting, fix issues 2019-04-29 22:40:32 -07:00
b3053f19ce Pagination changes and cleanup.
Refactored PaginationBox to be abstract. Implementations can generate individual components as needed now.
Add lots of Component usage to schematic list, help listings, etc.
Fix a few schematic and file resolution issues.
2019-04-28 01:12:05 -04:00
62353a46db Added a pagination box and use it in Biome List and Chunk List 2019-04-27 21:57:45 +10:00
7dcf8f5a45 Fixed //setbiome 2019-04-27 17:32:02 +10:00
f33140b327 Port ChunkCommands, fix up injection, simplify registration 2019-04-16 23:02:23 -07:00
e127bb89e5 Align annotation formatting with brush command methods 2019-04-15 02:03:05 -07:00
2b10128720 Restore Logging for setbiome 2019-04-15 01:25:19 -07:00
f8c4f23658 Partial work on biome commands, need logging replacement 2019-04-14 01:30:40 -07:00
7a88039711 Fixes #105 2019-04-12 01:04:54 +10:00
140809c903 Working now 2019-04-05 15:15:10 +11:00
8897109dc4 wip upstream merge 2019-04-04 00:25:16 +11:00
f361619037 Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11:00
92a7bd5e44 minor tweak for mutable vectors 2019-04-01 03:09:20 +11:00
85bfd16d7c Code cleaning
Most notable change: Remove redundant type parameters and replaced with <>. This is a small step to bring us closer to upstream parity.
2019-03-25 19:55:32 -04:00
1b101740fe Use a proper registry for biomes 2019-02-16 17:27:00 +10:00
842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
399e0ad5fa Refactor vector system to be cleaner
- Move Vector, etc. into `.math` package
- Drop many methods that will be auto-promoted anyways, eg. with
`divide(int)` and `divide(double)` the first is now gone.
- Take Block vectors into their own class hierarchy
- Make it clear throughout the API what takes blockvectors
- many more improvements
2018-11-03 23:00:23 -07:00
6f04022738 And these stubs 2018-08-13 03:23:53 +10:00
a629d15c74 Copy paste/merge FAWE classes to this WorldEdit fork
- so certain people can look at the diff and complain about my sloppy code :(

Signed-off-by: Jesse Boyd <jessepaleg@gmail.com>
2018-08-13 00:03:07 +10:00
1480606b52 Fixed a few more issues found looking over the changeset. 2018-08-04 11:43:42 +10:00
282eca7663 Added a category system and refactored registries 2018-08-04 11:43:39 +10:00