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
NotMyFault
a5795461f2
Improve a few dependency scopes
2021-09-22 23:00:12 +02:00
dordsor21
663d0139b7
default to a meaningful preload chunk count
2021-09-22 15:58:20 +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
268d8cff49
Apply list of properties everywhere
2021-09-21 18:53:37 +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
NotMyFault
3617a29ba8
Address javadoc violations
2021-09-21 17:40:53 +02: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
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
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
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
Matt
4f68fb0e26
Add tracing feature to EditSessions (Upstream 1301) ( #1112 )
...
Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-09-19 20:02:41 +00: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
NotMyFault
5f7411114e
Fixes #1310
2021-09-19 21:42:53 +02: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
NotMyFault
07be1c6a44
Remove native libs - lz4-java links them dynamically
2021-09-17 16:22:02 +02: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
NotMyFault
9fb6ebe7ac
Shift ZSTD bindings check
2021-09-16 21:56:28 +02:00
dordsor21
1dd0dac462
Correct equality check for adding post processor
2021-09-16 17:49:16 +01:00
dordsor21
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 dc2e1bec1e
)
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 41c0ea98f1
)
2021-09-13 12:30:58 +01:00
dordsor21
f5d6d4079a
*Actually rename section index everywhere
...
(cherry picked from commit 3ea3bd2a78
)
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 ce915fe04d
)
2021-09-13 12:30:44 +01:00
dordsor21
66b79b4ea2
Remove unneeded IQueueWrapper, clean up some queue classes slightly
...
(cherry picked from commit 66e22df3f4
)
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 74f1d21f6e
)
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 3ea725a863
)
2021-09-13 12:30:12 +01:00
dordsor21
da2a846d3d
Don't return null when adding processors to NullExtent
...
(cherry picked from commit 1a8ad8133e
)
2021-09-13 12:29:49 +01:00
NotMyFault
cdbbedb662
Update Upstream
...
6008fe7 Remove class shutter
2021-09-13 10:51:58 +02:00
dordsor21
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
82220ef87e
Move HeightMapType and HeightmapProcessor into own package
2021-09-11 13:37:31 +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
SirYwell
5fb4434afe
Fix indexing and custom world heights in HeightmapProcessor
2021-09-11 10:26:02 +02:00
NotMyFault
f29d68b16e
Update Upstream
...
fbf61ef Fix raise and lower deform brushes (1889)
2021-09-11 10:15:44 +02: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
88ae6d9e1d
Optimise HeightmapProcessor (around 16x faster)
2021-09-10 16:53:25 +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
195a13a23c
some codestyle application
2021-09-08 16:39:43 +01:00
NotMyFault
8aadeb9291
Identify as Fawe when throwing unknown exceptions
...
Closes #1281
Closes #1279
Closes #1282
2021-09-06 15:28:54 +02:00
NotMyFault
d236470df8
Update Upstream
...
b1c230d Add conditional checking in help command (1888)
b4fbbc9 Move clearable checks for Bukkit to adapters (1887)
2021-09-04 10:31:31 +02:00
dordsor21
79f4be3941
Adjust some synchronisation
2021-09-02 18:06:36 +01:00
NotMyFault
09c4655be7
Setup allowed-plugins
with an example plugin
2021-09-02 18:53:14 +02: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
b9e4b31c68
Clean up ChunkHolder slightly, only trim chunk get if not already present
2021-09-02 12:31:27 +01:00
dordsor21
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
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
ea6b29f145
Fix up annotations in block classes and slight cleanup
2021-08-25 12:25:33 +01:00
dordsor21
df18fcef92
Fix #1250
2021-08-25 11:16:06 +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
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
NotMyFault
cf671ad7ff
Update Upstream
...
ed28089 Don't crash if fields are null in ChunkDeleter (1874)
f049d56 Revert "Use a Guava Cache instead of a ThreadLocal (1859)"
c5a4450 Internally use a negated mask class to prevent russian doll wrapping (1877)
1397ec7 Add Snow Smooth Tools (1580)
Fixes #955
Fixes #858
2021-08-22 11:56:39 +02:00
SirYwell
df8b2802b2
Support custom world min heights when processing heightmaps
2021-08-21 10:52:45 +02:00
dordsor21
cd576a2a87
Fix #1241
2021-08-20 16:33:58 +01:00
dordsor21
563ad7761a
Fix LocalBlockVectorSet
...
- Fixes #1238
2021-08-19 13:10:09 +01:00
NotMyFault
188e4b6215
Fix unknown direction exception missing key
2021-08-18 14:57:14 +02:00
dordsor21
6a932f2eda
Preloading is paper only.
2021-08-17 22:34:51 +01:00
dordsor21
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 <mc.cache@web.de>
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
2021-08-17 22:13:51 +01:00
dordsor21
664cd4e33d
Preloader is null for spigot users
2021-08-17 18:06:57 +01:00
dordsor21
347bd04065
Fix initialisation
2021-08-17 17:09:52 +01:00
dordsor21
4cae37fbbf
Add back extra angle mask prefixes
2021-08-17 17:07:37 +01:00
dordsor21
569fdc3861
Reimplement radius mask, fix wall mask
2021-08-17 17:03:25 +01:00
dordsor21
46f6395279
Improve mask parsing
...
- Fixes #1230
2021-08-17 17:02:11 +01:00
NotMyFault
f6676cf6a3
Follow up to 1ee4de0edf
2021-08-17 16:57:35 +02:00
dordsor21
0ffab8ee69
Add null check to preloader
2021-08-17 15:38:47 +01:00
dordsor21
8c11ba7fea
Preload chunks up to the configured limit, cancel preloading on EditSession complete
2021-08-17 12:07:48 +01:00
dordsor21
da7aca8ef8
Add basic preloading ( #1221 )
2021-08-16 20:47:09 -04:00
dordsor21
d4d98708f9
Re-implement richer mask and transform parsing ( #1223 )
...
Co-authored-by: dordsor21 <dordsor21@gmail.com>
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
2021-08-16 09:03:06 +00:00
dordsor21
3e4f1d5cd8
Better Mathman#isInteger
2021-08-11 20:38:52 +01:00
dordsor21
00a6a2d917
Fix stash failure
2021-08-11 15:03:59 +01:00
dordsor21
3ba42df321
Use more MutableBlockVector3s
2021-08-11 14:56:10 +01:00
dordsor21
6f5430a940
Some cleanup of mutables
2021-08-11 14:00:12 +01:00
dordsor21
8928556c1d
Minor improvement to MathMan#isInteger
2021-08-11 12:32:46 +01:00
Pierre Maurice Schwang
7d3a9ff36d
Fixed Unit Tests (BlockVector3.isLongPackable) ( #1168 )
...
* Fixed Unit Tests (BlockVector3.isLongPackable)
* Re-enable tests for ci
* Address gh action dependency complaints
* Fix "invalid usage of tag &" for MinecraftVersion.java
* Simple StubServer for BukkitWorldTest.java
* Add parallelgzip to test runtime, fixed javadoc encoding, make gradlew executable and patch StubServer for latest spigot / paper release
* Move Javadoc UTF-8 to PlatformConfig.kt
* Revert "make gradlew executable"
Was required for act to run, but not required for GH actions - Weird behavior
* Mark upstream changes, move class + apply editorconfig
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
2021-08-10 09:31:37 +01:00
Maddy Miller
e2b2feb7c5
Use MethodHandle for faster event bus ( #1865 )
...
* Use MethodHandle for faster event bus
* Implement hashCode/equals
* Apply review comments
* Bind to the object directly
2021-08-09 10:21:42 +01:00
dordsor21
57f7c93033
Fix history rollback
...
- Fixes #959
2021-08-08 19:35:57 +01:00
Maddy Miller
f06ba41f91
Fix Cycler tool not using full block data ( #1868 )
...
(cherry picked from commit 8ee45137aa5d7a3b80b661601ab14e48f13756ec)
2021-08-08 17:33:45 +01:00
Joseph Thomas
d10b038e84
Create SurfaceAngleMask ( #1215 )
2021-08-08 09:59:42 +00:00
dordsor21
2376ce8d9d
Add thickness to //hcyl and //br cylinder -h
...
- Closes #753
2021-08-08 10:02:58 +01:00
NotMyFault
75b888a9f0
Add missing translation keys
2021-08-08 01:52:28 +02:00
dordsor21
9af77c06b8
Fix ParallelQueueExtent#setBlocks(Region, <B extends BlockStateHolder>)#
...
- Fixes removeabove/removebelow
2021-08-07 17:38:09 +01:00