Commit Graph

72 Commits

Author SHA1 Message Date
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
238c56a3c6 Revert "Revert matt's changes"
This reverts commit bfcc6184ad.
2020-06-13 14:41:36 -04:00
bfcc6184ad Revert matt's changes
Let's not break Fawe, thanks
2020-06-13 18:48:57 +02:00
33adba4a6f Use a long to refer to the volume of a region to prevent overflow (#1350)
* Use a long to refer to the volume of a region, and rename the method to getVolume

* Fixed issues noted in review

* Forgot to floor

* Fixed review notes

* Can use a long here rather than BigDecimal

* Improve javadocs

* style

(cherry picked from commit 328030fd6281e58a4ea1d0cdd0a2e274da90afbe)
2020-06-12 21:45:49 -04:00
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
6ed7923a1e Add //cancel 2019-11-02 12:51:24 +01:00
f0ab1d5f18 finish overhaul of NBT stream api 2019-11-01 18:29:13 +01:00
2080e9786b commanding-pipeline diff 2019-10-23 05:23:52 +01:00
51a5c22677 I hope these are the last few errors 2019-10-03 20:37:19 -04:00
fa25ad22cd Harden JsonFileSessionStore against nulls/Gson oddities 2019-09-23 11:46:24 -07:00
6162a47002 Force non-Locatable actors to use placeAtPos1 2019-09-21 18:21:22 -07:00
8b96cdc9a5 *
A tribute to Jesse
2019-09-20 21:52:35 -04:00
68eea925e1 update adapter and platform manager 2019-08-29 13:57:03 +01:00
4e49d16505 fix dependencies 2019-08-26 05:45:03 +01:00
7a57a5dd8c minor
idk it compiles now
2019-08-10 16:01:42 +10:00
afae2b0784 Make TE tag optional for MCEdit schems too.
And name our threads here too.
2019-08-01 20:15:34 -04:00
7967ef4db4 ff586011 2019-07-30 07:39:18 +10:00
ff5860113d It started on work with commands then I got carried away. 2019-07-25 14:44:10 -04:00
6e13b44f84 resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b 2019-07-18 20:12:23 +10:00
dd38cbe750 . 2019-07-18 04:30:02 +10:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
f99d6e7478 wip on 1.14 2019-07-09 17:18:51 +10:00
625cbe5e3d Make //count take a mask. Also doc updates, perm fixes. 2019-06-30 00:38:17 -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
d0a31691e1 Small changes 2019-06-26 20:14:00 -04:00
de4dcc0dd5 idk, messing around with region filtering 2019-06-26 20:22:21 +10:00
a69b239848 Upstream 2019-06-25 13:07:47 -04:00
7b47d9a945 Add /tracemask. (#474)
Allows setting a mask used for block traces. This allows brush tools to
pass through various materials, such as water (e.g. `/tracemask #solid`
or `/tracemask !air,water`) before starting to build.
By default, a null mask is equivalent to #existing (original behavior).

https://gfycat.com/ImmaculateFrayedCockatiel
2019-05-23 21:12:31 -04:00
ceff17c4f7 Misc fixes.
Closes a few old youtrack issues which I don't remember because I had
like 30 tabs open, and a few other issues which I found while testing
some of those.
2019-05-05 15:15:03 -04:00
7c174beaee Region filter 2019-05-05 03:58:26 +10:00
648ecf2153 Add entity, biome, and mask flags to clipboard brush. 2019-04-26 16:41:39 +10:00
af1af43ac1 Allow copy/pasting biomes.
Copy takes a -b flag to copy biomes.
Paste takes a -b flag to paste biomes (if available).
This allows flexibility to create/load schematics with/without biomes
(when schematic biome support is added).

Also added a -m mask flag to paste to set a source mask, and a -e flag
to skip pasting entities if they are loaded.
2019-04-26 16:41:39 +10:00
b5e1f3dbc3 Remove the system property check for uuidOverride (#459)
as it caused a server timeout...
https://pastebin.com/z5ktU8r3
2019-04-10 22:39:56 -04:00
a7c5580db3 comment out forced key 2019-04-11 11:19:51 +10:00
31ac2b69d1 Fix block rotation 2019-04-07 17:41:26 +10:00
c8529b0609 . 2019-04-07 10:52:30 +10:00
2143b9b5b7 finish block registry 2019-04-05 17:51:42 +11:00
94d5d8df8e Merge branch 'master' into breaking 2019-04-05 15:47:04 +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
0d88a6bce2 Merging upstream changes 2019-03-26 13:27:09 -04: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
25631af31c Add RequestExtent to be used when a delayed EditSession is needed.
For example, if you set a mask that takes an extent (many of them),
and then move to another world, the mask will test blocks in the old
world and return bad results.
2019-03-20 19:13:54 -04:00
d6804737cf Switch to SLF4J logging. 2019-03-13 19:51:48 -07:00
1c5d3368a0 Defer permissions check when making LocalSession.
Also use Java7 Paths to get rid of some funky logic.
2019-03-11 21:31:43 -04:00
de08c8b8c7 Add better control over expression timeouts. (#451)
Add better control over expression timeouts.
* //timeout command can be used to change player's current timeout.
* Config now also has a max timeout, can be bypassed with permission
* Timeout of < 0 will let expressions run indefinitely.
* Said expressions won't run on a separate thread, slightly reducing the
  overhead from context switching. For large //gen commands, for example,
  this can actually increase speed.
2019-03-06 19:58:32 -05:00
0e5847e1ce Various fixes 2019-02-03 09:22:10 -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