Commit Graph

1360 Commits

Author SHA1 Message Date
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
ed6f3e7b4a Implement simplex mask (fixes #437) 2020-07-05 11:19:48 +02:00
11373c865a Fix BlockCategoryMasks not working 2020-07-03 21:57:30 +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
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
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
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
437d5a2a43 Minor image brush changes 2020-06-17 22:34:55 -04:00
238c56a3c6 Revert "Revert matt's changes"
This reverts commit bfcc6184ad.
2020-06-13 14:41:36 -04:00
bfcc6184ad Revert matt's changes
Let's not break Fawe, thanks
2020-06-13 18:48:57 +02:00
1eacb91267 Make extent public (unsafe) 2020-06-12 21:45:49 -04:00
8a5899459f Use Integer.compare() instead of if statements. 2020-06-12 21:45:49 -04:00
9ce4a415cb Fix errors while using the broken commands 2020-06-12 21:45:49 -04:00
35c2a74c52 Implement more masks 2020-06-12 21:45:49 -04:00
33adba4a6f Use a long to refer to the volume of a region to prevent overflow (#1350)
* Use a long to refer to the volume of a region, and rename the method to getVolume

* Fixed issues noted in review

* Forgot to floor

* Fixed review notes

* Can use a long here rather than BigDecimal

* Improve javadocs

* style

(cherry picked from commit 328030fd6281e58a4ea1d0cdd0a2e274da90afbe)
2020-06-12 21:45:49 -04:00
a23b182de5 Fix vector gen, always enable BlockMap tests
The BlockMap tests got much faster, so there's no need to hide them
behind a flag.

(cherry picked from commit 1e2496af552891e3b43c5703bda8dc4129bbcc5d)
2020-06-12 21:45:49 -04:00
518f52ea6e Test more of the math/collections, fix VectorPList
Fixes #1291

(cherry picked from commit e0346ff53b8629a368cdbf62cbd347caecfae5fd)
2020-06-12 21:45:49 -04:00
63b81b801b Implement remove on set/iter views of BlockMap
Fixes #1354.

(cherry picked from commit 637da62e34e676015aa7fbad490cf6f033e55b89)
2020-06-12 21:45:48 -04:00
3caf53987f Minor upstream changes 2020-06-12 21:45:48 -04:00
5602b33b78 Fix a few links 2020-05-30 09:17:21 +02:00
bdc14c10c7 Fix relight and removelight (#475)
* Start work on lighting engine (does not build)

* Implement getLighting

* Setting, flushing light etc works. Getting light should be working..?

* Better queue/chunk handling

* Use correct location for lighting update

* Correct set location, remove debug

* cleanup a little

* Fix fixlight

* Apply to all versions for the numpties

* Remove lighting extent if not using

* Actually bitmask blocks when setting in chunks

* Initialise Maps and Dequeues with inital size

* format

* Documentation maybe
2020-05-27 11:45:08 +01:00
1ff5e7761b Comment out not working and add TODO 2020-05-27 11:39:23 +01:00
255c20f4ad Fix recursivePickaxe 2020-05-27 11:39:23 +01:00
2de45458d4 Compare using BlockType, not Block for AreaPickaxe, fixes #436 2020-05-25 14:36:58 +01:00
35c4de3484 Fixes #427 2020-05-20 11:41:36 +02:00
fb06c3bf39 Update SuperPickaxeCommands.java 2020-05-19 13:29:37 +01:00
5fabd15caf Fix superpickaxe // 2020-05-18 19:39:53 +02:00
5be11c541b Put the synchronisation higher up the food chain 2020-05-14 22:32:32 +01:00
34d40cb856 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-05-13 17:45:17 -04:00
376bbe1bdb Edit change count to default to 0 instead of -1
Why was it ever defaulted to -1?
2020-05-13 17:45:11 -04:00
2ccda85772 Fix #468
That's not how it works
2020-05-13 22:36:08 +01:00
1183c7c957 Fixes #466 2020-05-13 10:23:38 -04:00
32c30f45fe don't read __reserved__ 2020-05-12 11:00:54 +01:00
999b063762 Don't write reserved to schematics 2020-05-12 10:58:43 +01:00
0848e68b9f Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.15 2020-05-11 17:46:55 -04:00
7c35477b8c Remove Empcraft messages 2020-05-11 17:46:41 -04:00
8c38ac0fbc Fix #460 2020-05-11 13:38:06 +01:00
cb20cef0e6 Fix loading schematic from URLs 2020-05-09 16:45:42 +01:00
ffa25b1d9a Fixes #452
- ChunkSections containing only air are technically null according to NMS Chunks
- Therefore if we're replacing air, we should ignore the result of get.hasSection(layer) by using "full = true" as it returns false if the chunksection is only air
- We also then need to ensure that the masks correctly identify that the block is "air"
2020-05-09 13:39:41 +01:00
56972ee40b Trim performance (#451)
* Increase performance slightly when trimming.
If the chunk section is all one blocks (common in plotworlds) it'll be a nice little boost.

* Cache whether blocks are ticking or not. Greatly reduces the time required to create a palette

* collapse 5 lines to 2.

* Also apply to 14 and 15 for the numpties

* Cleanup
Actually ignore the exception - remove my debug print.
Remove double semi-colon

* Apparently 1.14/15 matter too still.
2020-05-07 23:00:13 +01:00
a2b0a5e622 Fix offset mask (< and >) 2020-05-07 19:38:42 +01:00
8b1a0bbc34 Fix #417
This commit aims to fix existing issues regarding the "0/-1 blocks affected" bug. Introducing the new LinkedFilter class allows us to use multiple filters for single-filter operations, e.g. applying a pattern to blocks while also counting the amount of blocks applied to. SetFilter.java was also removed due to not being used.
2020-05-07 12:29:18 -04:00