Commit Graph

190 Commits

Author SHA1 Message Date
0afae082c2 Remove string switches for BlockType 2019-04-06 03:34:11 +11:00
94d5d8df8e Merge branch 'master' into breaking 2019-04-05 15:47:04 +11:00
1beea3cd22 Some more upstream merge 2019-04-04 21:28:41 +11:00
8897109dc4 wip upstream merge 2019-04-04 00:25:16 +11:00
7086eb8b3e continue with merge 2019-04-03 22:28:57 +11:00
8aef06b29e *
haven't done one of these in a while
*continuing with merge in previous commit
2019-04-03 17:00:59 +11:00
f361619037 Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11:00
29692f3fbe Migrate to SLF4J 2019-04-02 18:21:02 -04:00
f87e31683e don't use origin as the region bounds 2019-04-02 00:19:32 +11:00
c9f1fed282 Fixes #88 2019-04-02 00:08:56 +11:00
6e6a3f9035 Fix plotsquared schematic hook 2019-04-01 21:30:21 +11:00
92a7bd5e44 minor tweak for mutable vectors 2019-04-01 03:09:20 +11:00
a80420d14b Add biome storage to BlockArrayClipboard. 2019-03-30 00:42:28 -04:00
42d0d6e79a Use getTag instead of requireTag in a few places. 2019-03-29 23:44:18 -04:00
8623dd0009 Fixes #80 2019-03-27 15:38:21 +01: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
3236bdd78e Changes to NBT-handling in operations and extents, changes to match the widely supported setBlock functionality, minor code cleanup 2019-03-25 13:42:11 -04:00
d6804737cf Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
7c89ece96e Few tweaks to schematic loading and error fixes.
* Not all EntityTypes in Bukkit have the correct enum name.
* Don't read entire schematic files to list. Go off file extension only.
   (Reading in files is more accurate, but slow.)
* Enforce extensions. (Due to the above, while you can technically make a
   schematic called 'test.txt', it's better that we save it as
   'test.txt.schem'.)
* Fix a few minor warnings.
2019-03-08 16:00:49 -05:00
c98a311146 Update to working PlotSquared repo; Update to PlotSquared C>Captions class rename; Cleaning and minor modifications to SpongeSchematicReader 2019-03-06 03:06:47 -05:00
1b101740fe Use a proper registry for biomes 2019-02-16 17:27:00 +10:00
88014b18a3 Added a few new things using block states.
* `//set ##*tag` sets all states in the tag (not just default state per type)
* `//set ^type` is a pattern changing block type but copying all valid existing states
* `//set ^[prop=val,...]` sets the property `prop` to `val` wherever the existing block has that property
* `//set ^type[prop=val,...]` does both of the above
Those work anywhere a pattern is taken, of course.

* The mask syntax `^[prop=val]` matches blocks with the property `prop` set to `val`, or blocks that don't have the property at all.
* The mask syntax `^=[prop=val]` only matches blocks that have the property.
Those work anywhere a mask is taken, of course. (`//mask`, `//gmask`, `//replace`, etc)

The `//drain` command now takes `-w` flag that removes the waterlogged state from blocks (in addition to removing water, as before).
2019-02-14 17:21:01 -05:00
511c279153 Fixed issues regarding block transformations and using the BaseBlock to apply a function. 2019-02-07 09:04:14 -05:00
4a8931a55a Added a ##tag parser Pattern. gives a random combination using the blocks from the tag with an equal distribution. 2019-02-03 07:59:06 -05:00
2bae161e5c Make biome changes undoable 2019-02-03 07:38:11 -05:00
b27913324b Tweak the last access extent cache to provide better caching 2019-02-03 07:35:38 -05:00
590b7e23a9 Remove all raw usages of BSH, improve API generics 2019-02-03 05:01:39 -05:00
c935e381b7 Added a method to teleport entities across worlds. 2019-02-02 11:23:02 -05:00
bc3562eb57 Few fixes for FastModeExtent. 2019-02-02 09:26:18 -05:00
e88b8c961d Added "fast mode corrections" 2019-02-02 09:21:16 -05:00
346eee8953 Added the multi-staging from the multipass2 branch 2019-02-02 09:12:30 -05:00
63bf01fdaf Check by setting blocks with BlockBagExtend for changed materials. 2019-02-02 09:05:59 -05:00
e53535319d Plenty of changes to core block behavior to become more compatible with upstream WorldEdit (still more to be done!) 2019-01-31 10:08:58 -05:00
2f9c7f19f5 Added support for 'rotation' BlockState values. 2019-01-22 21:59:20 +10:00
2e0fa300b7 Actually support disabling chunk loading extent 2019-01-22 21:34:37 +10:00
432a201266 Make biome changes undoable 2019-01-21 19:07:29 +01:00
f74381b93f Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system 2019-01-13 02:00:14 -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
4d6045813c Move vectors to static creators, for caching 2019-01-10 07:17:04 -05:00
ab6aed703d Merge current FAWE master (227d6d91) into new-vector-system
Signed-off-by: Byron Marohn <combustible@live.com>
2019-01-09 22:35:26 -08:00
a9919d130c Current progress #4 2019-01-09 03:32:38 -05:00
842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
871541d8c0 Tweak the last access extent cache to provide better caching 2018-12-29 19:21:45 +10:00
3fefcbf971 Remove all raw usages of BSH, improve API generics 2018-12-26 16:39:10 -08:00
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
801793cc12 Merge upstream changes through 7961fa58
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 12:13:43 -08:00
c949b07df1 Added a method to teleport entities across worlds. 2018-12-21 16:56:10 +10:00
c0fa1602ad Restore the formatting of many things to upstream WorldEdit - no code changes
This patch touches many files but changes absolutely no functionality.
The goal here is to make future merges with worldedit produce fewer
conflicts that have to be resolved.

This patch was made by painstakingly diff'ing files and copying changes
over from the last upstream merge commit (02c6f11b) into this codebase.

Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-20 11:33:56 -08:00
700e41b706 Remove the final stage committer from the MultiStageReorder extent, as it caused issues and no longer appears to be entirely necessary. 2018-12-13 20:30:54 +10:00
6f3016c7f0 Fixed up the commitRequired checks. 2018-12-09 16:28:01 +10:00