Commit Graph

69 Commits

Author SHA1 Message Date
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
cfa147cf76 WIP clipboard offsets
TODO schem load -> BlockArrayClipboard
2019-11-11 22:34:33 +00:00
fc5c625f02 Add -n flag to //paste to select without pasting. 2019-11-09 20:58:47 -05:00
240b2de90c Update to PlotSquared-we branch 2019-11-06 09:29:20 +00:00
0bfb1dbdd1 Fix BlockArrayClipboard offset 2019-11-05 15:08:44 +00:00
d8d7c8c53f Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline
 Conflicts:
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/filters/DistrFilter.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ChunkCache.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ParallelQueueExtent.java
	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java
	worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
	worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
2019-11-02 15:58:46 -04:00
f262271519 Message updates 2019-11-02 15:53:25 -04:00
df9e9e510a Limit processing 2019-11-02 12:13:42 +01:00
72951cdf23 Various
fake chunk packet
aliases
cfi wip
2019-10-30 12:26:52 +01:00
fd408c64ed Selective merge of commanding branch. 2019-10-23 12:58:36 -04: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
2080e9786b commanding-pipeline diff 2019-10-23 05:23:52 +01:00
da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
24a147465d Fixed a bunch of extends and removed slottableblockbag 2019-09-21 21:00:45 -04:00
14ed3f1d9c Remove FawePlayer and API modifications 2019-09-13 23:05:16 -04:00
0620478763 feature(cli): Added a CLI version of WorldEdit, and allowed most commands to be run from console (#508)
* Re-do commits to avoid awful rebase

* You can load and save a schematic file now. Still gotta setup ability to use commands as a console actor.

* Add a world override concept to LocalSession, and allow a lot more commands to be performed by actors.

* Fixed commands, and set the loaded schematic as the world override in CLI

* Properly load tags

* Added 1.14.4 data values

* Allow a majority of commands to be performed by the console.

* Fixed a lot of PR requested changes

* Added a Locatable interface and use that for getting the location of the player in commands.

* Added script support. Currently requires a newline at the end of the script.

* Shade everything to allow this to run locally - should probably minimize this to an extent later.

* Actually hook up the version

* Added a //world command to set the override

* Fixed a missed checkstyle issue

* Added CommandBlock support to Bukkit

* Make command block support configurable

* Minor cleanup and implementing a few of the final functions

* Fixed most issues from PR

* Improve UX, saving is now automatic and unknown command messages show

* Better save docs and support any clipboard format

* Include the entire formats list

* Arrays.copyOf

* Clear the world override if the selector is called on another world.

* Update logging extent to allow basic logging with non-player actors
2019-08-25 19:58:28 +10:00
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
61bc012f6f Fix source masks using EditSession instead of clipboard. (#515) 2019-08-10 11:54:22 -04:00
92fb90de09 Fix some arguments 2019-08-07 06:18:44 +10:00
a476ab1ea0 merge 2019-08-07 01:29:49 +10:00
ff5860113d It started on work with commands then I got carried away. 2019-07-25 14:44:10 -04:00
9c3122a227 More work on getting commands to compile 2019-07-21 22:49:08 -04:00
f500b5e056 CommandContext + Confirmation
Use InjectedValueAccess instead
Fix command confirmation
2019-07-19 06:03:27 +10:00
be8213d8ee resolve conflicts 2019-07-18 16:56:57 +10:00
68ea3d6e99 revert some changes 2019-07-17 20:50:54 +10:00
3113d8dd69 Optional 2019-07-17 16:11:55 +10:00
cedb261313 fix some Command annotations 2019-07-17 15:43:18 +10:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
a2b3aabbbf Typo fixes and command clarifications/cleanup.
Also re-disable the gradle daemon. It doesn't always play nice with
ForgeGradle and hogs ram.
2019-07-04 19:28:42 -04:00
8c44c532c4 753b34ef99 2019-06-29 02:35:41 +10:00
a1c15e1c39 Many upstream changes. Should be non-breaking 2019-06-25 09:00:44 -04:00
753b34ef99 Cleaned commands and extents a bit. 2019-06-23 14:00:22 -04:00
10f7fb6a26 Add //br and //brush as aliases. 2019-05-13 18:49:43 -04:00
56908a7d62 Update to final Sponge schem v2 spec.
Read lenient, write strict.
2019-05-09 16:59:06 -04:00
7ff537138a Merge master again 2019-04-26 01:25:42 -07:00
648ecf2153 Add entity, biome, and mask flags to clipboard brush. 2019-04-26 16:41:39 +10:00
f0587354be Cleanup, make copy/paste flags consistent, add status messages. 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
640fac6374 Add flags 2019-04-21 10:28:50 +02:00
37c993be16 Port ClipboardCommands, update to new Key 2019-04-18 12:34:57 -07:00
f33140b327 Port ChunkCommands, fix up injection, simplify registration 2019-04-16 23:02:23 -07:00
f849caf655 Fix clipboard upload/download 2019-04-15 21:05:26 +10:00
f361619037 Merge remote-tracking branch 'upstream/master' into breaking 2019-04-03 16:53:34 +11:00
699783ba72 Another selective merge 2019-03-28 15:02:37 -04:00
8eccdc7444 Add -f flag to //count to allow fuzzy inputs.
Also re-implement //distr -c. And remove outdated help text on //copy.
2019-03-25 22:38:51 -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
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
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