MattBDev
7f51791d6c
Merge remote-tracking branch 'remotes/origin/commanding' into commanding
...
# Conflicts:
# worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java
# worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
2019-07-29 10:58:41 -04:00
MattBDev
ca54f8c371
Work on CLI and I forget what else
2019-07-29 10:57:28 -04:00
Jesse Boyd
02d5f3e8d5
Update PlatformManager.java
2019-07-29 05:27:50 +10:00
MattBDev
7963b2c92f
Removed commands.yml
...
I also did a few renames as well as a command registration fix.
2019-07-26 19:23:24 -04:00
MattBDev
3a3efb8117
Updated a class, minor command tweaks, and formatting
2019-07-25 14:58:59 -04:00
MattBDev
ff5860113d
It started on work with commands then I got carried away.
2019-07-25 14:44:10 -04:00
MattBDev
478c330c1e
Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding
...
# Conflicts:
# worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
# worldedit-core/src/main/java/com/boydti/fawe/object/extent/NullExtent.java
2019-07-22 22:26:00 -04:00
MattBDev
b230999ca0
Mainly formatting and some work on schematic commands
2019-07-22 22:22:32 -04:00
Jesse Boyd
c05d425f64
couple more compilation issues
2019-07-23 06:58:18 +10:00
MattBDev
46f5b12b36
Convert tabs to whitespace.
2019-07-22 16:42:40 -04:00
Jesse Boyd
283351fea5
fix conflicts
2019-07-22 16:39:43 +10:00
Jesse Boyd
07283af614
some bindings
2019-07-22 16:02:51 +10:00
MattBDev
9c3122a227
More work on getting commands to compile
2019-07-21 22:49:08 -04:00
Jesse Boyd
f5c202af6d
BrushCommands
2019-07-21 21:39:36 +10:00
Jesse Boyd
85ebee7da7
brush settings
2019-07-20 01:29:49 +10:00
Jesse Boyd
f500b5e056
CommandContext + Confirmation
...
Use InjectedValueAccess instead
Fix command confirmation
2019-07-19 06:03:27 +10:00
Jesse Boyd
81298bf555
add command queuing
2019-07-19 03:10:04 +10:00
Jesse Boyd
6e13b44f84
resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b
2019-07-18 20:12:23 +10:00
Jesse Boyd
dd38cbe750
.
2019-07-18 04:30:02 +10:00
Jesse Boyd
ff94a1e5ed
8108d0a9
2019-07-18 04:24:21 +10:00
Jesse Boyd
905fbf5a0b
8108d0a9
2019-07-18 02:31:13 +10:00
Jesse Boyd
08dead5a86
cleanup build script
2019-07-17 19:43:14 +10:00
MattBDev
8108d0a936
Major command changes that don't work yet.
2019-07-16 23:44:34 -04:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114
2019-07-11 08:08:55 +10:00
Jesse Boyd
cafd4bfece
use Locale.ROOT for uppercase as well
2019-07-10 22:26:31 +10:00
Jesse Boyd
f99d6e7478
wip on 1.14
2019-07-09 17:18:51 +10:00
MattBDev
ffc2092d93
toggles and timeouts
2019-06-30 14:56:32 -04:00
Jesse Boyd
a2efdbc488
a1c15e1c39
2019-06-29 03:10:47 +10:00
Jesse Boyd
d9906c9026
229182aa63
2019-06-29 01:19:58 +10:00
MattBDev
3a4354268c
Attempt to fix null command issues.
2019-06-26 20:18:21 -04:00
MattBDev
d0a31691e1
Small changes
2019-06-26 20:14:00 -04:00
MattBDev
a69b239848
Upstream
2019-06-25 13:07:47 -04:00
MattBDev
a1c15e1c39
Many upstream changes. Should be non-breaking
2019-06-25 09:00:44 -04:00
MattBDev
0313320816
As Jesse would say... *
2019-06-20 20:05:18 -04:00
MattBDev
1f14d4652e
Upstream changes, prefix changes, formatting changes, variable name changes
...
I think that draining waterlogged items also works now?
2019-06-12 17:13:53 -04:00
NotMyFault
ec001b8d3b
Revert "Upstream, generics, formatting"
...
This reverts commit cd88e513a8
.
2019-06-12 15:45:41 +02:00
MattBDev
cd88e513a8
Upstream, generics, formatting
2019-06-11 20:31:56 -04:00
MattBDev
229182aa63
Remove CUI and other cleaning
2019-06-06 18:39:51 -04:00
MattBDev
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
MattBDev
6c94cca15e
Selective upstream merge
...
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
2019-06-04 12:40:11 -04:00
Jesse Boyd
113aeb1689
Use fuzzy blocks in default block parser
2019-05-07 16:40:37 +10:00
Jesse Boyd
2be8d87d5a
Fix mask parsing not using factory
2019-05-05 03:59:25 +10:00
Jesse Boyd
c45d4b58cc
Fixes #117
2019-04-23 22:56:01 +10:00
Jesse Boyd
69e2ce6165
Avoid block vector creation for combine stages = false
2019-04-15 19:56:38 +10:00
Jesse Boyd
99c4c2f35d
Add option to disable commands
2019-04-12 10:51:18 +10:00
NotMyFault
dcfa436c64
Minors
...
- Make disallowed-blocks translatable
- Add more trnslatable messages
- Update WorldEdit messages missing a prefix
2019-04-11 19:49:09 +02:00
NotMyFault
d49be8047c
Fix missing prefixes
2019-04-11 15:13:15 +02:00
Jesse Boyd
6996a97027
various minor
...
CFI works without PlotSquared
tab completion
biome tweaks
WIP on anvil
document disallowed-blocks in legacy config
2019-04-11 21:32:32 +10:00
Jesse Boyd
24590199c8
Fix disallowedBlocks
2019-04-11 14:05:29 +10:00
Jesse Boyd
2e1b7676eb
Just use instanceof
2019-04-11 02:17:45 +10:00
Jesse Boyd
b24ebaf6f2
Delay command setup
2019-04-10 22:03:10 +10:00
Jesse Boyd
1529c187d2
Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking
2019-04-07 17:41:51 +10:00
Jesse Boyd
c8529b0609
.
2019-04-07 10:52:30 +10:00
NotMyFault
ab3394c35e
Add prefixes and make FAWE more translatable
2019-04-07 01:13:23 +02:00
Jesse Boyd
ee797219b4
Fix findFreePos
2019-04-06 06:13:15 +11:00
Jesse Boyd
501992dd20
Fix setPosition
2019-04-06 05:51:18 +11:00
Jesse Boyd
144215c813
Don't construct new BaseBlock
2019-04-06 01:12:57 +11:00
Jesse Boyd
be5541b61b
revert some changes
2019-04-05 15:48:41 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking
2019-04-05 15:47:04 +11:00
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