Commit Graph
100 Commits
Author SHA1 Message Date
dordsor21 268244119f Update adapters? 2021-09-24 17:05:26 +01:00
dordsor21 6b5f21d67b Support old, corrupt, schematics 2021-09-24 16:41:09 +01:00
dordsor21 4e944052cd un-transitive some dependencies 2021-09-24 15:49:30 +01:00
dordsor21 e97c945b2f Big fix to clipboards when relogging/restarting server etc.
- Refactor the way FAWE clipboards work slightly with regards to offsets (FAWE-added) and origin (upstream-present)
 - Better error messages when exceptions are thrown attempting to load DOC
 - No longer attempt to resolve old clipboard versions. Attempt to give informative error instead
 - Don't always delete clipboards held in memory on player logout unless configured to do so
 - Go back to fully closing the DOC on logout. We now attempt to lock the file which will hopefully help with debugging shared clipboard folders
2021-09-24 12:22:01 +01:00
dordsor21 bfd9e5b347 Don't stop edits for old clipboards, attempt to load them anyway (for now) 2021-09-24 09:32:49 +01:00
dordsor21 8593c2df9f Rearrange DOC methods 2021-09-23 12:42:51 +01:00
dordsor21 07c02b5825 Remove import static org.apache.logging.log4j.LogManager.getLogger 2021-09-23 12:34:22 +01:00
dordsor21 6c56fa29aa Fix #1317 2021-09-22 22:22:39 +01:00
dordsor21 40b024fbba Set legacy ID when adapter is loaded to enable reading/writing anvil 2021-09-22 16:15:18 +01:00
dordsor21 663d0139b7 default to a meaningful preload chunk count 2021-09-22 15:58:20 +01:00
dordsor21 a3d50585c2 Don't print error message if we're expecting it on biome loading 2021-09-22 15:58:11 +01:00
dordsor21 3376baa3c5 Remove needless EditSession#getWorld for setting blocks/biomes in a couple of cases
#32 IntellectualSites/FastAsyncWorldEdit-Adapters#7
2021-09-22 15:04:12 +01:00
dordsor21 d25a85e0d4 Fix expression evaluation method used for generatebiome
#32
2021-09-22 15:03:03 +01:00
dordsor21 4400b0f83e Fix #1114
- Ensure short is correctly cast to int, as we're using it as if it were unsigned
2021-09-22 14:32:49 +01:00
dordsor21 a241e594c1 Slight adjustment to DOC 2021-09-22 13:14:10 +01:00
dordsor21 64036a38cf Update adapters to https://github.com/IntellectualSites/FastAsyncWorldEdit-Adapters/commit/32c896db93a124c22bcc8bf205f3ff6034f919e2 2021-09-22 12:58:09 +01:00
dordsor21 268d8cff49 Apply list of properties everywhere 2021-09-21 18:53:37 +01:00
dordsor21 cf585c48ae Update adapters 2021-09-21 18:41:01 +01:00
dordsor21 e750e014ab Properties can have the same string name
Make map of all properties string against list
2021-09-21 18:34:31 +01:00
dordsor21 b8ec4be95c Revert "Slightly preferable messages on UsageException thrown by piston"
This reverts commit e9adf0f30d.
2021-09-21 17:30:32 +01:00
dordsor21 c805102819 Fix #1143 2021-09-21 17:18:49 +01:00
dordsor21 1de3a6b54a Don't return "=" pattern early either 2021-09-21 15:07:58 +01:00
dordsor21 70f7f00abf Do the same for "=" mask 2021-09-21 15:06:46 +01:00
dordsor21 c26977f578 Fix very specific issue where charmasks (< > $ etc.) are used with other masks, but only the charmask is used 2021-09-21 15:05:43 +01:00
dordsor21 57b47d2451 Use a MaskTraverser to set extent where it will be a WorldWrapper otherwise 2021-09-21 14:59:49 +01:00
dordsor21 23ca345a2e Don't setextent twice in replace 2021-09-21 14:51:39 +01:00
dordsor21 971977a66a Fix //sel list 2021-09-21 14:51:05 +01:00
dordsor21 84b896151f Lazy fix for #1271 2021-09-21 14:39:14 +01:00
dordsor21 d0056870be Fix fuzzy region 2021-09-21 14:31:03 +01:00
dordsor21 69ae4a7121 Fix ellipsoid selection 2021-09-21 14:07:10 +01:00
dordsor21 0fcf996c78 Fix #1314 2021-09-20 23:54:26 +01:00
dordsor21 e9adf0f30d Slightly preferable messages on UsageException thrown by piston 2021-09-20 23:35:04 +01:00
dordsor21 9d26f030dc Fix some command errors being hidden by a usage message 2021-09-20 23:18:38 +01:00
dordsor21 040edc8fd0 Adjust exception catch slightly 2021-09-20 23:07:58 +01:00
dordsor21 bb06492091 Fix -f flag 2021-09-20 18:10:37 +01:00
dordsor21 017a28b3dd Implement getAllProperties to code and adapters 2021-09-20 16:00:50 +01:00
dordsor21 35e0a47beb Don't have adapters as "dependency" 2021-09-20 15:09:34 +01:00
dordsor21 d5be6940c7 Add default getAllProperties method 2021-09-20 14:46:51 +01:00
dordsor21 17a97f2f19 Fix lack of handling of custom world heights in CharFilterBlock 2021-09-20 14:15:08 +01:00
dordsor21 7a9cbe5d77 Correct description of strip nbt 2021-09-20 01:54:49 +01:00
dordsor21 aba147f787 Minor spring clean 2021-09-19 21:40:15 +01:00
dordsor21 8a4f28a7cc StripNBT processor rather than extent 2021-09-19 21:39:00 +01:00
dordsor21 b11a67e435 Fix #1311 2021-09-19 21:20:18 +01:00
dordsor21 f405994346 Improve fullycopy pattern parsing
- Don't attempt ClipboardFormats#loadAllFromInput if the user is typing #copy or #clipboard to avoid needless "File dialogs are not supported in your environment." message
2021-09-19 20:47:40 +01:00
dordsor21 abaa98d2a9 Fix #403 2021-09-19 20:47:21 +01:00
dordsor21 0a48765c98 Add //blob command equivalent to //br rock 2021-09-18 17:42:58 +01:00
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