Commit Graph
100 Commits
Author SHA1 Message Date
dordsor21 7d032ba69f Scattercommand should use the same editsession for all commands, make it "silent" by default and allow players to see output if wanted. 2021-09-18 17:42:40 +01:00
dordsor21 34301b446a Allow scatter command brush to use FAWE commands. Best for scatter sphere, etc. 2021-09-18 17:08:03 +01:00
dordsor21 51aa500857 move yscale earlier in br height for people that can't work it out themselves 2021-09-18 16:20:28 +01:00
dordsor21 7a0c0d5d41 Fix #990 2021-09-18 16:15:31 +01:00
dordsor21 fad1fcd8ee Fix RichParser suggestions 2021-09-18 15:07:41 +01:00
dordsor21 54398ebe1c Add timeout to regex masking 2021-09-18 15:01:09 +01:00
dordsor21 dbbb450172 Flush clipboards before writing schematics.
#1286
2021-09-18 03:19:49 +01:00
dordsor21 bd95d5a86d Adjust mask managers
- Add list of "exclusive" managers to config to aid users in having some sort of prioritisation.
 - Fixes #960 if PlotSquared is added to exclusive managers, otherwise, there's no particularly sane way of adding prioritisation without requiring a treemap be added to YAML config, or for us to decide upon it ourselves
2021-09-18 03:19:27 +01:00
dordsor21 1cc6ad1481 Fix #1049 2021-09-17 17:26:41 +01:00
dordsor21 90aeb48040 Fix #1297 2021-09-17 17:12:14 +01:00
dordsor21 5093569ce0 Fix #1303 2021-09-17 14:54:51 +01:00
dordsor21 74697ee312 Fix ZSTD implementation and test-loading. Don't allow disabling of the test on startup 2021-09-17 14:38:28 +01:00
dordsor21 1dd0dac462 Correct equality check for adding post processor 2021-09-16 17:49:16 +01:00
dordsor21 4182d7473c Slightly improve regen workflow, update adapters to https://github.com/IntellectualSites/FastAsyncWorldEdit-Adapters/commit/a9c745a60020da34f4c7c3969c3afb5affda4cd2 2021-09-16 17:42:31 +01:00
dordsor21 e4cbd85197 Ensure adapters are up to date 2021-09-15 01:44:00 +01:00
dordsor21andGitHub f10dbe7387 Use an object array for synchronising on internal chunk sections rather than the sections array itself.
- Synchronising on full sections synchronises on the global FULL instance (bad)
- Synchronising on empty sections synchronises on the local empty instance (bad)
- Leads to needless thread locking, and raises the possibility of cyclic locks considerably
2021-09-14 20:20:04 -04:00
dordsor21 635ec0e7a8 Fix #736 2021-09-14 14:44:23 +01:00
dordsor21 8120163f5e Fix #727 2021-09-14 14:33:20 +01:00
dordsor21 dad991e7aa synchronise filterBlocks - we shouldn't be able to execute the call method whilst a filter is ongoing and vice versa 2021-09-14 14:32:42 +01:00
dordsor21 09d2996451 Don't accept values smaller than parallel threads for target size
- Smaller than parallel threads implies any time any thread tries to do anything, another thread must cancel its work, and the chunk is submitted.
2021-09-14 14:30:32 +01:00
dordsor21 daa418a287 Fix needless complication of section position methods in CharBlocks children 2021-09-13 18:33:42 +01:00
dordsor21 ce7a97368f Improve javadocs on BlockArrayClipboard, ensure correct clipboard is used for BlockArrayClipboard's parent clipboard 2021-09-13 15:32:33 +01:00
dordsor21 06d716248e Flush clipboard rather than close on player disconnect
Addresses #1291
2021-09-13 15:08:03 +01:00
dordsor21 3088b1245c Simplify flushing of clipboards in ClipboardCommands 2021-09-13 15:07:16 +01:00
dordsor21 f641fc1716 Javadoc 2021-09-13 13:27:47 +01:00
dordsor21 5207981fb2 Make clipboard flushable
#1286
2021-09-13 13:25:11 +01:00
dordsor21 fcbbc72a19 Refactor the try-catch for copy/cut commands, switch to saveDiskClipboard instead of closing the clipboard on error
Address #1291
2021-09-13 13:19:57 +01:00
dordsor21 adf83bdd0a Use default blockstate internal id for creating blockstates from their serialised form
Fixes #1294
2021-09-13 13:14:49 +01:00
dordsor21 40a4010041 Add loadIfPresent method for use where the section should definitely exist and be FULL 2021-09-13 12:47:00 +01:00
dordsor21 af890cf21d Fix build
(cherry picked from commit dc2e1bec1eca4d7f8d24bd40e32c385d91af3099)
2021-09-13 12:31:06 +01:00
dordsor21 b6b6ba7265 Improve CachedMask a bit - no need to unwrap/wrap blockvectors, allow extents to be parsed
(cherry picked from commit 41c0ea98f16ecbfadced41e4be277ad6ceda6b1a)
2021-09-13 12:30:58 +01:00
dordsor21 f5d6d4079a *Actually rename section index everywhere
(cherry picked from commit 3ea3bd2a78e0d8bae239de24beb72f69ac7fe619)
2021-09-13 12:30:49 +01:00
dordsor21 7876ab825e Make blocking executor a fair policy
Safer if we're submitting lots of chunks for recursive operations. These chunks should be handled in the order they're submitted so we don't handle a chunk that's been submitted twice (possible) in the wrong order

(cherry picked from commit ce915fe04dd83676ae0045b3a675788f486e2cc6)
2021-09-13 12:30:44 +01:00
dordsor21 66b79b4ea2 Remove unneeded IQueueWrapper, clean up some queue classes slightly
(cherry picked from commit 66e22df3f4c505a0a302d47c0c10302275e2a191)
2021-09-13 12:30:39 +01:00
dordsor21 d60d178513 Rename section index to position as it's a more suitable name
(cherry picked from commit 74f1d21f6e3db8970763a080529e3fc1f03fdb81)
2021-09-13 12:30:22 +01:00
dordsor21 d9a8c047a2 don't create chunk set if it doesn't already exist when checking for biomes
It shouldn't ever create the set at this point though

(cherry picked from commit 3ea725a863c148c12884b3f5a94262eb58b5deaa)
2021-09-13 12:30:12 +01:00
dordsor21 fc47fd586c Update adapters
(cherry picked from commit 6f180421e1193b3b97dad18480a6178d5b249a14)
2021-09-13 12:30:05 +01:00
dordsor21 da2a846d3d Don't return null when adding processors to NullExtent
(cherry picked from commit 1a8ad8133ef6feae8fdf40d5317934ee6bf31314)
2021-09-13 12:29:49 +01:00
dordsor21andNotMyFault 5d31b7034d Deprecate sponge schematic reader/writer and tell users why (#1287) 2021-09-13 10:51:58 +02:00
dordsor21 8e214b1232 Javadocs to LocalBlockVectorSet 2021-09-11 16:59:00 +01:00
dordsor21 8c8419a1c5 LocalBlockVectorSet shouldn't actually be used from multiple threads. SparseBitSet is not thread safe 2021-09-11 16:41:42 +01:00
dordsor21 6e586da83e Some code cleanup
- Simplify MaskFilter slightly
- Improve thread safety of LocalBlockVectorSet
- Simplify if statement in SingleThreadQueueExtent
- Better error in MathMan#tripleSearchCoords for handling of the error in some cases
2021-09-11 16:38:01 +01:00
dordsor21 e85586db80 Only set ParserContext extent to world if null when setting world 2021-09-11 16:25:45 +01:00
dordsor21 a923c112ee Actually do what I said for min/max Y in HeightmapProcessor 2021-09-11 14:25:47 +01:00
dordsor21 2c0c57ec4f Update adapters 2021-09-11 13:49:06 +01:00
dordsor21 82220ef87e Move HeightMapType and HeightmapProcessor into own package 2021-09-11 13:37:31 +01:00
dordsor21 333b9c184e Go into more detail about tree types not being there because version 2021-09-11 12:54:09 +01:00
dordsor21 f84c98e721 Use given min/max y values in HeightmapProcessor 2021-09-11 12:41:06 +01:00
dordsor21 6cbd9631a0 Improve notes on getting the stored section range/refactor method name 2021-09-11 12:40:39 +01:00
dordsor21 37998ec598 Refactor heightmap classes to math where it makes more sense
(not required by heightmap processor, nor are they processors, used for heightmap brushes etc.)
2021-09-11 12:23:03 +01:00
dordsor21 db24b429c1 only close clipboard on error during copy
apply to //cut as well
2021-09-11 00:27:26 +01:00
dordsor21 470ba64fe4 Fix #1260 2021-09-10 17:46:21 +01:00
dordsor21 829ddc393f Fix #1268 2021-09-10 17:14:55 +01:00
dordsor21 c16212e456 Update adapters 2021-09-10 16:54:30 +01:00
dordsor21 88ae6d9e1d Optimise HeightmapProcessor (around 16x faster) 2021-09-10 16:53:25 +01:00
dordsor21 f0a6fa13da Fix serverlib shading 2021-09-10 16:25:31 +01:00
dordsor21 0e72fa5058 Specify requirement for delay-chunk-unloads-by to be set for preloading 2021-09-10 15:52:46 +01:00
dordsor21 3f182c63bc Fix #1285 2021-09-10 14:53:07 +01:00
dordsor21 effb94623a Fix exceptions being squashed RegionVisitor preloading 2021-09-10 14:41:15 +01:00
dordsor21 ef62f1e0d9 Fix adapters cos it's just plain wrong..? 2021-09-10 14:13:59 +01:00
dordsor21 195a13a23c some codestyle application 2021-09-08 16:39:43 +01:00
dordsor21 cdc3abbc43 bump p2 version 2021-09-03 14:48:58 +01:00
dordsor21 4bf2781cd0 Update adapters to https://github.com/IntellectualSites/FastAsyncWorldEdit-Adapters/commit/ae35e5327666f27fac571c86dc28a48808e0e685 2021-09-02 18:07:08 +01:00
dordsor21 79f4be3941 Adjust some synchronisation 2021-09-02 18:06:36 +01:00
dordsor21 f8aaf0cae3 Don't set extent to self when cancelling in AbstractDelegateExtent
#749
2021-09-02 17:13:38 +01:00
dordsor21 93dff36ee2 Fix #1265 2021-09-02 14:08:49 +01:00
dordsor21 15d888a40c Updated adapters to https://github.com/IntellectualSites/FastAsyncWorldEdit-Adapters/commit/5016d6d295b7f76321783983a9ea541b9fdebb34
#1266
2021-09-02 13:47:27 +01:00
dordsor21 b9e4b31c68 Clean up ChunkHolder slightly, only trim chunk get if not already present 2021-09-02 12:31:27 +01:00
dordsor21andGitHub fb7e95c440 Improve exceptions (#1256)
- Kick more exceptions further up the pipeline to be more likely to be shown to player
- Try to avoid lots of console spamming when it's the same error multiple times
- Allow parsing of FaweExceptions during commands to better give information to players
2021-09-01 16:36:03 +02:00
dordsor21 0e62760abf Update adapters to https://github.com/IntellectualSites/FastAsyncWorldEdit-Adapters/commit/9c5798ea7df4feb9238197dc96ce4c254d31f082 2021-08-29 10:28:23 +01:00
dordsor21 ebc38a62ad Should fix #1237 and should fix #1236 2021-08-26 16:44:49 +01:00
dordsor21 cacfcb8c5c LimitExtent isn't a processor 2021-08-26 16:44:08 +01:00
dordsor21 da8289f8ba Fix #826 2021-08-25 16:19:51 +01:00
dordsor21 4050cf238f Fix #1217 2021-08-25 15:48:39 +01:00
dordsor21 29bebcd034 Fully fix #949 2021-08-25 15:32:25 +01:00
dordsor21 4e463af1df Remove log output from DefaultBlockParser 2021-08-25 14:12:40 +01:00
dordsor21 a66080d803 Fix build, add note 2021-08-25 14:06:12 +01:00
dordsor21 46fb0c9418 Add binary tag methods to IDelegateBukkitImplyAdapter 2021-08-25 12:53:37 +01:00
dordsor21 ea6b29f145 Fix up annotations in block classes and slight cleanup 2021-08-25 12:25:33 +01:00
dordsor21 80d99073ec Remove PluginPreloader 2021-08-25 11:19:31 +01:00
dordsor21 df18fcef92 Fix #1250 2021-08-25 11:16:06 +01:00
dordsor21 46c96b45fc Fix build 2021-08-25 11:16:01 +01:00
dordsor21 012e55e780 Fix links 2021-08-25 11:08:14 +01:00
dordsor21 7d9abc9273 Skip corrupt tile entities in legacy schematics 2021-08-23 21:46:50 +01:00
dordsor21 6301a7adb9 Deprecate and add the warnings for BlockType#getState as it is broken 2021-08-23 21:28:06 +01:00
dordsor21 c0893a404d Set default number of iterations for snow smooth brush to 1. 2021-08-23 21:27:35 +01:00
dordsor21 0aadef97d0 Quick fix for SnowHeightMap 2021-08-23 21:26:59 +01:00
dordsor21 ddc59809d8 Update adapters to https://github.com/IntellectualSites/FastAsyncWorldEdit-Adapters/commit/ff01bfd70d1a9cc305ba6bb5297d60aa41dd38fa 2021-08-23 20:59:29 +01:00
dordsor21 1a0f7df3f4 Fix #1243 2021-08-23 13:08:10 +01:00
dordsor21 2e0de7b197 Fix nullability issue with SnowHeightMap mask, apply some cleanup and reduce needless object creation 2021-08-23 11:57:00 +01:00
dordsor21 cd576a2a87 Fix #1241 2021-08-20 16:33:58 +01:00
dordsor21 8e899b8524 Skip registering "custom" biome.
Update adapters to 332c1f6bb17d2ded53fe5b09f3f2a4578f3f9bfc
2021-08-20 16:30:51 +01:00
dordsor21 3dd943f961 Avoid paper-only method 2021-08-20 15:53:12 +01:00
dordsor21 cf68caff99 Correct default biome loading method 2021-08-19 14:12:55 +01:00
dordsor21 f412796f28 Load default biomes into registry at earliest convenience, then load custom biomes later. 2021-08-19 13:48:24 +01:00
dordsor21 563ad7761a Fix LocalBlockVectorSet
- Fixes #1238
2021-08-19 13:10:09 +01:00
dordsor21 6a932f2eda Preloading is paper only. 2021-08-17 22:34:51 +01:00
1d9b1a3d5e Remove hardcoding of world limits (#1199)
* Remove hardcoding of world limits
 - seems to be working fine without the datapack for world height changing
 - particular attention should be given to LocalBlockVectorSet and MathMan changes

* update adapters

* Override getMinY in various classes and ensure selections have a world attached to them

* no message

* Address comments
 - Fix for lighting mode 1

* A few more changes

* Fix LocalBlockVectorSet

* Fix range statement

* Various fixes/comment-addressing
- There's not much point in having a different file name now for history. We've broken it before...
- Fix history read/write
- Fix range on for loops in CharBlocks

* undo bad CharBlocks change

* Fix history y level

* Fix biome history

* Fix lighting

* Fix /up

* Make regen fail not because of these changes

* Fixes for y < 0

* Fix isEmpty where only the uppermost chunksection is edited

* Fix javadocs/FAWE annotations

* Better explain why BiomeMath is removed

* If history task throws an error, it should only be caught and printed if not completing now.

* Min|max world heights for new patterns

* Load biomes from NMS instead of bukkit (#1200)

* Update adapters

* Update adapters

* Don't initialise BlockTypes when biomes aren't set up yet so all BiomeTypes.BIOME are no longer null thanks.

* Address some comments.

* rename layer -> sectionIndex to imply inclusivity

* Javadoctored.

Co-authored-by: NotMyFault <[email protected]>
Co-authored-by: Hannes Greule <[email protected]>
2021-08-17 22:13:51 +01:00
dordsor21 f7161ea890 Update adapters 2021-08-17 18:45:08 +01:00
dordsor21 664cd4e33d Preloader is null for spigot users 2021-08-17 18:06:57 +01:00