Jesse Boyd
33f5322fda
WIP merge (i'll finish this later)
2019-04-05 01:24:47 +11:00
Jesse Boyd
1beea3cd22
Some more upstream merge
2019-04-04 21:28:41 +11:00
Jesse Boyd
8897109dc4
wip upstream merge
2019-04-04 00:25:16 +11:00
Jesse Boyd
7086eb8b3e
continue with merge
2019-04-03 22:28:57 +11:00
Jesse Boyd
4cd8d08134
merge with upstream (broken)
2019-04-03 16:53:58 +11:00
Jesse Boyd
f361619037
Merge remote-tracking branch 'upstream/master' into breaking
2019-04-03 16:53:34 +11:00
matt
122236f6c7
Too lazy to write a commit message
2019-04-02 23:36:32 -04:00
matt
29692f3fbe
Migrate to SLF4J
2019-04-02 18:21:02 -04:00
Jesse Boyd
92a7bd5e44
minor tweak for mutable vectors
2019-04-01 03:09:20 +11:00
matt
699783ba72
Another selective merge
2019-03-28 15:02:37 -04:00
wizjany
d7d2d03ee8
Clipboard offset pattern is now #copy@[x,y,z].
...
Since the parsers were changed around, unescaped commas are parsed as
separate blocks now.
2019-03-27 23:36:59 -04:00
wizjany
2a194b0434
Add pattern that randomly chooses states.
...
Also works with fuzzy states.
Syntax is `*type`, e.g. `//set *stone_slab` or with states,
`//set *oak_fence[waterlogged=false]`
2019-03-26 18:11:32 -04:00
matt
0d88a6bce2
Merging upstream changes
2019-03-26 13:27:09 -04:00
matt
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
IronApollo
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
wizjany
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
wizjany
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
Kenzie Togami
d6804737cf
Switch to SLF4J logging.
2019-03-13 19:51:48 -07:00
wizjany
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
wizjany
f84f3c6f85
Fix error when parsing hand/offhand/pos1 as blocks.
2019-03-03 19:51:49 -05:00
IronApollo
3ffb5ff00d
Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing
2019-02-27 08:09:04 -05:00
Matthew Miller
5de8e0852c
Treat categories as empty when missing
2019-02-18 21:17:36 +10:00
Matthew Miller
1b101740fe
Use a proper registry for biomes
2019-02-16 17:27:00 +10:00
wizjany
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
wizjany
287be0209c
Slight readability and usability improvements.
...
Also no longer allows trailing strings (e.g. //set #clipboardasdf).
2019-02-12 17:11:57 -05:00
wizjany
19796aa3be
Added offset to ClipboardPattern.
...
Takes input like '//set #clipboard@-1,0,1' which shifts the pattern over.
It also now extends RepeatingExtentPattern, which was previously unused.
2019-02-12 17:11:57 -05:00
Matthew Miller
3e988e7ffe
Fixed parsing fuzzy blocks failing.
2019-02-11 20:30:42 +10:00
wizjany
cdd71178f5
Ensure BlockCategories are initialized.
...
We should probably have a way to initialize all these catalog classes ahead of time.
2019-02-04 22:34:25 -05:00
IronApollo
0e5847e1ce
Various fixes
2019-02-03 09:22:10 -05:00
IronApollo
2d586ff53e
Registry changes & additions
2019-02-03 08:53:04 -05:00
Matthew Miller
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
Kenzie Togami
8f11d0469b
Clarify state when asking for caps with no platforms (+ fuzzy system changes)
2019-02-03 07:30:18 -05:00
Matthew Miller
7d7da78dbc
Fuzzier fuzzies
2019-02-03 07:13:21 -05:00
Kenzie Togami
590b7e23a9
Remove all raw usages of BSH, improve API generics
2019-02-03 05:01:39 -05:00
gamerforEA
ea0ca470f1
Fix Metrics injection
2019-02-03 03:51:15 -05:00
Matthew Miller
26d4ea101e
Fixed the bundle being directly used outside of the registry system.
2019-02-03 03:44:10 -05:00
Matthew Miller
53308416ff
Start work on modularising masks and patterns
2019-02-03 03:33:52 -05:00
Matthew Miller
c935e381b7
Added a method to teleport entities across worlds.
2019-02-02 11:23:02 -05:00
Matthew Miller
54142c8669
Added a display name to Actors
2019-02-02 09:37:14 -05:00
Matthew Miller
f3c633582e
Finish removal of PlayerDirection, and partially added diagonal support back to commands. (Other minor changes to WorldEdit-Sponge and FAVS)
2019-02-02 08:43:57 -05:00
IronApollo
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
Matthew Miller
f3ec5bbdde
Added a ##tag parser Pattern. gives a random combination using the blocks from the tag with an equal distribution.
2019-01-31 22:28:04 +10:00
IronApollo
f74381b93f
Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system
2019-01-13 02:00:14 -05:00
Matthew Miller
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
Kenzie Togami
4d6045813c
Move vectors to static creators, for caching
2019-01-10 07:17:04 -05:00
Byron Marohn
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
IronApollo
842b1307c7
Current Progress #3
2019-01-09 02:13:44 -05:00
Kenzie Togami
2f8bdccf65
Clarify state when asking for caps with no platforms
2018-12-28 22:20:12 -08:00
Matthew Miller
8da984d9f9
Fuzzier fuzzies
2018-12-27 15:19:58 +10:00
Kenzie Togami
3fefcbf971
Remove all raw usages of BSH, improve API generics
2018-12-26 16:39:10 -08:00
IronApollo
d4157b7e0e
Current progress with update
2018-12-23 11:19:33 -05:00
Matthew Miller
b75d5149eb
Fixed the bundle being directly used outside of the registry system.
2018-12-23 21:43:20 +10:00
Matthew Miller
1d5e9b7d04
Few fixes
2018-12-23 21:24:58 +10:00
Matthew Miller
645fd682b6
Finish porting all the old masks across
2018-12-23 19:10:05 +10:00
Matthew Miller
6312bcecf6
Fixed the item parser not using the ItemRegistry
2018-12-23 19:02:58 +10:00
Matthew Miller
c5d9aadab8
Start work on modularising masks and patterns
2018-12-23 18:56:26 +10:00
Byron Marohn
dab9e9a799
Fix imports - build working again
...
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 08:09:58 -08:00
Matthew Miller
c949b07df1
Added a method to teleport entities across worlds.
2018-12-21 16:56:10 +10:00
Byron Marohn
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
Matthew Miller
8f236afae9
Added a display name to Actors
2018-12-18 17:36:53 +10:00
Matthew Miller
24800a662a
Finish removal of PlayerDirection, and partially added diagonal support back to commands.
2018-11-12 12:38:13 +10:00
Kenzie Togami
2c8b2fe089
Move vectors to static creators, for caching
2018-11-03 23:00:24 -07:00
Kenzie Togami
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
IronApollo
767607ea68
Fix for '//mask ?' resulting in pattern error
2018-10-29 06:39:40 -04:00
Kenzie Togami
1fa1ff895b
Flush or disable buffers in tools
2018-10-20 19:47:17 -07:00
NotMyFault
2d8a2fc9c7
Minors
...
- Typo fixes
- updated jenkins download link
2018-10-16 22:15:45 +02:00
Jesse Boyd
1a12c065a1
Various minor fixes
...
Fix drain
Fix some messages lacking prefix
Fix non persistent brushes
2018-10-13 15:15:38 +11:00
BuildTools
6a3177f4e7
Fixed DefaultBlockParser incorrectly referencing disallowedBlocks
2018-10-02 07:32:24 -04:00
Jesse Boyd
277ff8f787
Fix command confirmation session
2018-09-08 09:10:36 +10:00
Jesse Boyd
82ede1d42b
freebuild region restrictions
2018-09-05 05:10:15 +10:00
Matthew Miller
fdc3cd56f7
Add a mask for block categories. Eg, you can now do //replace ##wool minecraft:sand to replace all wool with sand
2018-08-30 14:51:38 +10:00
Jesse Boyd
abd886acd7
some hasty refactoring
2018-08-28 02:56:28 +10:00
Jesse Boyd
a61c856adc
Allow certain commands to bypass queuing
2018-08-24 19:33:52 +10:00
Jesse Boyd
dbd31ea347
Fixes boy0001/FastAsyncWorldedit#1090
2018-08-24 01:22:30 +10:00
Jesse Boyd
c55353e5b1
Various command (use es6 if java9 + nashorn)
2018-08-22 03:22:37 +10:00
Matthew Miller
d3b3d57041
Merge pull request #420 from sk89q/server-side-cui
...
Added a server side version of WorldEditCUI with limited functionality
2018-08-20 14:46:08 +10:00
Matthew Miller
7b83f97c35
Fixed NotABlockException not getting thrown
2018-08-19 14:41:09 +10:00
Matthew Miller
7f419618cc
Switch to using fake blocks, no more world pollution
2018-08-18 15:22:49 +10:00
Jesse Boyd
5d47d1bce6
Rethrow input parse in mask parser
2018-08-17 23:07:41 +10:00
Jesse Boyd
36ede1b27d
Fixes boy0001/FastAsyncWorldedit#1078
2018-08-17 18:27:48 +10:00
Jesse Boyd
ebd27781a7
Catch pattern syntax
2018-08-16 23:38:56 +10:00
Matthew Miller
bc5609114b
Add a material to check if air is air, because there are now 3 types of air.
2018-08-16 15:42:11 +10:00
Jesse Boyd
8de1fff263
Fix block parse NPE
2018-08-16 00:34:20 +10:00
Jesse Boyd
a67441bbff
Merge remote-tracking branch 'refs/remotes/sk89q/master'
...
# Conflicts:
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
# worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
2018-08-15 14:02:51 +10:00
Jesse Boyd
55d34343dd
Fix some api compatibility issues
2018-08-14 17:18:49 +10:00
Jesse Boyd
1740c845d2
What are the dud BlockCategories?
2018-08-14 11:00:44 +10:00
Jesse Boyd
1601ea07a8
Clear the command/method map after registration
2018-08-14 00:39:19 +10:00
Jesse Boyd
0632a9ce96
Fix some merge issues
2018-08-14 00:38:33 +10:00
Jesse Boyd
7fb3899bb7
Use BlockState for player inventory getBlock
2018-08-13 03:31:26 +10:00
Jesse Boyd
e7c27b08bf
Remove stub injector methods
2018-08-13 02:36:39 +10:00
Jesse Boyd
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
Matthew Miller
f54d6afb65
Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.
2018-08-10 20:29:06 +10:00
Matthew Miller
5f4cc3e694
Cleanup a little bit more code.
2018-08-06 19:08:15 +10:00
Matthew Miller
b2769befdb
Added a few utility methods.
2018-08-04 11:43:42 +10:00
Matthew Miller
c05c33cab0
Make a lot of progress on legacy conversions.
2018-08-04 11:43:42 +10:00
Matthew Miller
1480606b52
Fixed a few more issues found looking over the changeset.
2018-08-04 11:43:42 +10:00
Matthew Miller
1090c44a2e
Parser must use lowercase.
2018-08-04 11:43:41 +10:00
Matthew Miller
965e977411
Fixed a few more errors, and added legacy support to the item parser.
2018-08-04 11:43:41 +10:00
Matthew Miller
9f9fda72b7
Re-add legacy support to block parser, and fix query tool.
2018-08-04 11:43:41 +10:00
Matthew Miller
663dd1f4d8
Added an entity, weathertype, and gamemode registry.
2018-08-04 11:43:41 +10:00