Commit Graph

74 Commits

Author SHA1 Message Date
d61dac5aa5 Fix CFI generation 2019-11-08 22:30:39 +00:00
faa63b0c35 CFI changeset 2019-11-08 05:27:04 +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
c383fab2c2 cfi packet listener 2019-10-30 12:58:21 +01:00
8356004ec9 chunk sending / cfi 2019-10-26 14:21:49 +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
8b96cdc9a5 *
A tribute to Jesse
2019-09-20 21:52:35 -04:00
14ed3f1d9c Remove FawePlayer and API modifications 2019-09-13 23:05:16 -04:00
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04: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
a3c58a187e merge 2019-08-07 01:29:09 +10:00
f5c202af6d BrushCommands 2019-07-21 21:39:36 +10:00
905fbf5a0b 8108d0a9 2019-07-18 02:31:13 +10:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
be78f2eae1 Added TODO to missing code. 2019-06-28 18:03:24 -04:00
55dad5a972 7f3c4c4828 2019-06-29 01:39:58 +10:00
9d1117303c Removed a stupid worldname method. 2019-06-18 23:43:06 -04:00
fb0bb62180 Removed installer
The code was mainly for forge and it was built using swing instead of javafx
2019-06-11 20:40:33 -04:00
7f3c4c4828 A lot of removals, upstream merges, and maybe more. 2019-06-07 20:58:48 -04:00
229182aa63 Remove CUI and other cleaning 2019-06-06 18:39:51 -04:00
f726c9afc4 fix //none for tools 2019-04-11 11:28:06 +10:00
94d5d8df8e Merge branch 'master' into breaking 2019-04-05 15:47:04 +11:00
8897109dc4 wip upstream merge 2019-04-04 00:25:16 +11:00
7086eb8b3e continue with merge 2019-04-03 22:28:57 +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
92a7bd5e44 minor tweak for mutable vectors 2019-04-01 03:09:20 +11: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
d6804737cf Switch to SLF4J logging. 2019-03-13 19:51:48 -07: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
1d87642b52 Minor improvements to the server side CUI 2019-02-03 03:54:04 -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
4d6045813c Move vectors to static creators, for caching 2019-01-10 07:17:04 -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
842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
a88f6b8430 Minor improvements to the server side CUI 2018-12-26 18:15:17 +10:00
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05: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
926f6a6ab8 Flush undo/redo 2018-12-09 16:28:01 +10:00
5f2c77b719 Further work on this. Currently fast mode breaks doors, gotta work out why applying physics to doors breaks them. 2018-12-09 16:28:01 +10:00
59f9864ba3 Set fast to the default 2018-12-09 16:28:01 +10:00
7f11b2800d Added an option to switch reorder modes 2018-12-09 16:28:01 +10:00
2c8b2fe089 Move vectors to static creators, for caching 2018-11-03 23:00:24 -07: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
1a12c065a1 Various minor fixes
Fix drain
Fix some messages lacking prefix
Fix non persistent brushes
2018-10-13 15:15:38 +11:00