Commit Graph

2500 Commits

Author SHA1 Message Date
eb74c7307c Fix blob brush doing weird things due to mutable vectors 2020-07-14 21:32:16 +02:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
204de7eab5 Add new annotations from upstream 2020-07-13 15:02:35 -04:00
1e80c0429a Merge remote-tracking branch 'origin/1.16' into 1.16 2020-07-13 13:09:55 -04:00
da96365504 Updating a few links 2020-07-13 13:13:43 +02:00
11e762f07a Add basic angle mask suggestions
Mask suggestions are a bit broken in general so this doesn't change much
2020-07-13 11:15:01 +02:00
7198c03cd3 Reimplement angle mask parsing 2020-07-13 02:25:30 +02:00
8e33ff9549 Make mask parsing actually working 2020-07-13 02:18:05 +02:00
4c299bc0b8 Replace setPosition with trySetPosition (#1403)
Allows cancellation information to be fed back into the ascend/descend
algorithms.

(cherry picked from commit 71e104bcb187a5313e88dda5df79059c8ffbc1fe)
2020-07-10 13:22:48 -04:00
c82fec931a Update discord link at debugpaste 2020-07-09 23:43:48 +02:00
33b2b634ac Allow specific P2 queue hooks to be disabled 2020-07-09 22:14:24 +01:00
6d6de61560 Updated missing biomes, entities, and categories. 2020-07-06 23:54:55 -04:00
39439fb405 fix: require extent for mask parsing (#1373)
(cherry picked from commit 1ced57c301bc1c98667a260fd8b6aa128675f0d2)
2020-07-06 23:47:33 -04:00
c0bfe06e4b Set ES6 compat flag for Rhino
(cherry picked from commit 849a515d4a5c02c083e5ab343db40d7eb05b2f51)
2020-07-06 23:45:28 -04:00
6fb10c3879 Make surface brush not replacing the whole world 2020-07-06 02:30:08 +02:00
ed6f3e7b4a Implement simplex mask (fixes #437) 2020-07-05 11:19:48 +02:00
704e76eb6d Fixes #519
Use regex for finding colour codes
Merge styles rather than replacing and undoing our work sometimes.
2020-07-04 14:15:49 +01:00
11373c865a Fix BlockCategoryMasks not working 2020-07-03 21:57:30 +02:00
9da4bbef5f Fix scatter/splatter brush 2020-07-03 20:43:34 +02:00
05ef46994e Update IChunkExtent.java
fix Indentation
2020-07-03 20:03:34 +02:00
bc45a112ee Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-03 19:54:08 +02:00
94b1233d98 implement entities in paste -e 2020-07-03 19:52:55 +02:00
77204df3f0 prevent players being teleported down a single block after some edits 2020-07-03 16:56:20 +01:00
e2ab87cc07 lazy //deform AIOOB fix.
Fixes #495
2020-07-03 16:45:28 +01:00
f7d375c76c Lazy heightmap range fix 2020-07-03 16:29:27 +01:00
9e25c736a0 Add new blocks to BlockTypes 2020-07-03 14:12:43 +01:00
2812841481 Add -p flag to //drain to allow kelp and watergrass to be removed.
properly fixed #464
2020-07-03 14:01:16 +01:00
ea7897934f Implement ability to use -w flag on //drain
fixes #464
2020-07-03 13:49:17 +01:00
fae528ab64 add a couple more changes++
Fixes #508
2020-07-03 13:18:09 +01:00
f1d4104480 Bunch of changes to help masks 2020-07-02 22:09:12 +01:00
18c9da372c GetBlocks should default to air not reserved 2020-07-02 18:16:15 +01:00
d3afc9c65d Update to p2 5.12.2 and implement clear pipeline 2020-07-02 14:34:05 +01:00
ac314fcedb Gradle update 2020-07-01 20:06:59 -04:00
34298f7dee Add back the getEntity Stuff since it seems to work fine 2020-07-01 19:28:38 +02:00
0fb564be0c Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.16
 Conflicts:
	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
2020-07-01 12:48:12 -04:00
9fc2387f11 Revert "start reimplementing entities"
This reverts commit aac02ceea1.
2020-07-01 14:54:11 +02:00
b96d45e4e6 merge 1.16 2020-07-01 14:46:25 +02:00
efc1a888d8 update links, versions, etc 2020-07-01 13:17:19 +01:00
0bb6bc3563 Start reimplementation of simplex pattern (#520)
* Start reimplementation of simplex pattern

* Fix suggestions

* Allow nested weighted patterns

* Add documentation and improve error handling

* Remove unnecessary code and obsolete TODOs
2020-07-01 13:01:39 +01:00
3b19738ea0 Merge branch '1.15' into 1.16
# Conflicts:
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitGetBlocks_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
2020-07-01 12:47:04 +01:00
3f3c49c0a8 Looks like working block setting and removal 2020-07-01 12:41:20 +01:00
f84958957c Fix various lighting issues
fixes #496
possibly fixes #497
2020-06-30 13:44:26 +01:00
d232dc28e3 Cherry-pick WNA, minor changes. 1.16 VERY WIP
First noticed incident of operations ruining ChunkSections. Do not build and use this unless you're testing.

Rushed some of the changes, gotta sleep. Would be nice to get a review of this one from @mattbdev and @dordsor21
2020-06-29 22:08:16 -04:00
4604aa5920 Additional work towards 1.16 compatibility
- Very basic implementation of the SideEffects system. Will definitely need fine tuning for it to be functional, but is not considered a priority in my opinion.
- Minor changes to the World interface and World implementations related to the SideEffects system. Shouldn't be the cause of any new bugs but be on the lookout.
- Included debug in BukkitImplLoader.java to assist contributors in understanding what needs to be implemented for the adapter to load properly.

Still very WIP but we're a few steps closer. So far, this is coming along better than I anticipated. Hopefully we can keep the momentum.
2020-06-29 22:08:16 -04:00
b59b95c282 Cherry-pick WNA, minor changes. 1.16 VERY WIP
First noticed incident of operations ruining ChunkSections. Do not build and use this unless you're testing.

Rushed some of the changes, gotta sleep. Would be nice to get a review of this one from @mattbdev and @dordsor21
2020-06-29 22:05:41 -04:00
2517aca66f Removed some unnecessary code. 2020-06-28 17:31:13 -04:00
82adab77b4 Additional work towards 1.16 compatibility
- Very basic implementation of the SideEffects system. Will definitely need fine tuning for it to be functional, but is not considered a priority in my opinion.
- Minor changes to the World interface and World implementations related to the SideEffects system. Shouldn't be the cause of any new bugs but be on the lookout.
- Included debug in BukkitImplLoader.java to assist contributors in understanding what needs to be implemented for the adapter to load properly.

Still very WIP but we're a few steps closer. So far, this is coming along better than I anticipated. Hopefully we can keep the momentum.
2020-06-26 22:14:19 -04:00
b7debce4d4 1.16.1 Prep work 2020-06-25 20:29:09 -04:00
aac02ceea1 start reimplementing entities 2020-06-25 22:13:34 +02:00
3d40336045 Fixes #500, Fixes #513 2020-06-19 09:12:58 +02:00