Commit Graph

54 Commits

Author SHA1 Message Date
318e367cf0 Correctly unregister player on quit and close clipboard if using disk. 2020-03-30 17:41:41 +01:00
1577ef61d4 Upstream merge 2020-03-23 20:59:56 -04:00
b7b11cc478 Gradle Upgrades and Clipboard Refactoring 2020-03-02 17:43:27 -05:00
1341e38a90 fix compile 2019-11-21 19:56:10 +00:00
52a502a1c6 Refactor confirmation 2019-11-21 06:50:37 +00:00
2c9f192baf Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
a23a4e5496 misc changes. 2019-11-11 16:02:28 -05: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
6ed7923a1e Add //cancel 2019-11-02 12:51:24 +01: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
8356004ec9 chunk sending / cfi 2019-10-26 14:21:49 +01:00
fd408c64ed Selective merge of commanding branch. 2019-10-23 12:58:36 -04: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
67b3fa054a Allow Actors to use generation commands 2019-10-07 15:23:40 -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
d434dfcfdd some minor refactoring 2019-08-18 02:09:09 +01:00
a476ab1ea0 merge 2019-08-07 01:29:49 +10:00
4ee2d3b47c Move isAllowedToFly and setFlying to AbstractPlayer, protect them. 2019-07-23 22:16:26 -04:00
2cc6a367c6 Move floatAt logic to AbstractPlayer, add isAllowedToFly and setFlying. 2019-07-23 22:16:26 -04:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -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
110f782a5c Optimize entity get (lazy nbt) 2019-04-14 00:00:38 +10:00
0d88a6bce2 Merging upstream changes 2019-03-26 13:27:09 -04: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
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
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
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
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
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
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
24800a662a Finish removal of PlayerDirection, and partially added diagonal support back to commands. 2018-11-12 12:38:13 +10:00
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
7f419618cc Switch to using fake blocks, no more world pollution 2018-08-18 15:22:49 +10:00
131fd39f63 Various minor
Add entity registry
Re-add AbstractLoggingExtent
Fill in missing nbt on entity load
2018-08-14 19:24:10 +10:00
e7c27b08bf Remove stub injector methods 2018-08-13 02:36:39 +10:00
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
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
1480606b52 Fixed a few more issues found looking over the changeset. 2018-08-04 11:43:42 +10:00
663dd1f4d8 Added an entity, weathertype, and gamemode registry. 2018-08-04 11:43:41 +10:00
e99190225e Further BaseBlock modernisation 2018-08-04 11:43:39 +10:00
e2608bc0c9 Further modernise and remove legacy item classes 2018-08-04 11:43:39 +10:00
aaaf2d5678 More deprecation removal 2018-08-04 11:43:38 +10:00