Commit Graph

2758 Commits

Author SHA1 Message Date
Jordan
75af797d4c
fix: extract new config option for deleting disk history on logout (#2772)
* fix: extract new config option for deleting disk history on logout
 - fixes #2663

* Copyto is nullable
2024-06-26 17:32:36 +02:00
9bb13e0384
Merge branch 'IntellectualSites:main' into main 2024-06-25 10:56:33 -05:00
Jordan
5708eb7aa0
fix: correct y index addition in biome history (#2797) 2024-06-23 22:33:36 +02:00
Jordan
4fe9c6bd74
fix: correctly process chunks when using worldguard region blacklists (#2789)
- fixes #2399
2024-06-21 08:49:09 +02:00
Jordan
d69dc97958
fix: take confirm-large from default limit for unlimited, add option to override (#2782)
- fixes #2706
2024-06-20 18:24:41 +02:00
Jordan
eaeb3a633a
fix: always init ChunkFilterBlock to the chunk (#2788)
- rename initFilterBlock from init to create
 - remove where we now needlessly init filter blocks
 - fixes #2662
2024-06-19 07:38:33 +02:00
Jordan
6a54c5bcb5
fix: recover from trimmed chunk (#2771)
- It's theoretically possible for the section FULL to return a null layer due to race condition with a trim operation
 - Locally cache result and if null, recover
 - I just had the error from #1592 again
 - This seems to have stopped the error, but adding logging did not log, so possibly some bigger bytecode changes?
 - Oh well
2024-06-17 17:40:59 +02:00
Jordan
3761b5184c
fix: correctly create Minecraft Structure format schematics (#2787)
- fixes #2784
 - fixes #2785
2024-06-15 15:52:11 +02:00
Jordan
8aba1e6c06
fix: allow use of quotes to allow spaces to be used as "and" (#2786)
* fix: allow use of quotes to allow spaces to be sued as "and"
 - e.g. `//set "#mask[grass_block&<air][green_concrete][red_concrete]"`
 - fixes #1883

* Remove static
2024-06-15 13:07:29 +02:00
754b228d84 Merge https://github.com/IntellectualSites/FastAsyncWorldEdit 2024-06-14 19:19:33 -05:00
dordsor21
4a5ff8e306
fix: wrap immutable map in MinecraftStructure writer
- fixes #2781
2024-06-14 19:18:35 +01:00
Jordan
031fdf2efd
fix: ensure config-legacy.yml is created before accessed (#2752)
* fix: ensure config-legacy.yml is created before accessed

* Stop error attempting to load FAWE config if it doesn't exist
2024-06-13 20:31:45 +02:00
Jordan
865cc55a0e
feat: add #hotbar mask and pattern (#2769)
- closes #2765
2024-06-13 20:31:34 +02:00
Jordan
9843bb0188
chore: address deprecations from new records (#2768)
* Category should implement Keyed
2024-06-12 15:00:40 +02:00
Pierre Maurice Schwang
ee5d1caa2c
Fix more upstream incompatibilities (#2767)
* Move more public types to records

(cherry picked from commit 35e58895f5379e78b856e8997a593701c6d9db21)

* chore: pull in PlacementType

* fix: mask reference in NegatedMask

* Use records in expression impl

(cherry picked from commit 453537c5b4783412aa1b4e982d7b72c637d0db8e)

* fix: variable record getter access

* chore: add since to Deprecated annotation

* chore: revert weird merge in ClientProxy

* chore: cleanup remaining deprecations

* chore: code-style

---------

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2024-06-08 09:07:05 +01:00
EpicPlayerA10
c095c492e0
fix: normalize layer when setting ordinal to ThreadUnsafeCharBlocks (#2764)
- fixes #2763
2024-06-07 12:30:31 +02:00
Jordan
5714a52675
fix: correctly trim the max chunk section (#2753)
- fixes #2727
- fixes IntellectualSites/Plotsquared#4436
2024-06-05 21:23:12 +02:00
dordsor21
a7e4d19605 Remove debug 2024-06-03 22:01:37 +02:00
dordsor21
47b0ece377 Add since tags to new methods 2024-06-03 22:01:37 +02:00
dordsor21
a82ba31185 feat: allow NBT on wand items
- closes #2383
2024-06-03 22:01:37 +02:00
Pierre Maurice Schwang
261ebfa754
feat: schematic share system, add missing Clipboard method for api compat (#2745)
* Allow plugins to register new clipboard share destinations (#1707)

* Allow plugins to register new clipboard share destinations

* Rename file, as per request

* Don't use the base enginehub name for EH_pastebin

* Address review comments

* Fixed wrong usage

* Use a second metadata class for clipboard shares

* Newline

* Address comments

* Improve docs

* Apply suggestions from code review

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Use a consumer so that we handle serialization

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/Clipboard.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ClipboardShareDestination.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ShareOutputConsumer.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ShareOutputConsumer.java

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

* Fixed a lot of random comments

* Return a consumer from share rather than a URL, allows the share destination to control output

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

(cherry picked from commit 6e2b0a1df8a6077c3cf8193e38dc9817038bcbe9)

* chore: cleanup cherry-pick remainders

* chore/feat: add ark as (default) schematic paster / sharing endpoint

* chore: default to fast schematic writer in share

* chore: re-format strings.json (seems to adjusted indentation when merging)

* chore: hopefully fixing strings.json (again)

---------

Co-authored-by: Maddy Miller <mnmiller1@me.com>
2024-06-02 18:21:56 +02:00
Jordan
7635eec2e4
fix: improve how we determine if using FAWE from jenkins (#2754)
- SNAPSHOT will usually only be removed if it's a release version
 - If others remove SNAPSHOT, then they're probably doing their own stuff, just use this as the "release" check
 - fixes #2744
2024-06-02 17:11:53 +02:00
dordsor21
5da6c65df6 fix: use correct coordinates in BufferedPattern2D and NoiseFilter 2024-05-31 18:52:49 +02:00
dordsor21
36d2c85fdb chore: address deprecations in vector classes 2024-05-31 18:52:49 +02:00
Pierre Maurice Schwang
c77d34156b
Fix compatibility with WorldGuard (#2743)
* Make the Vector classes into Records (#2477)

* Make the Vector classes into Records

* Drop custom equals and hashCode methods in Vector/BlockVector classes

(cherry picked from commit 0df2b6af4c1ce18b77eedd5c62eeb45011512103)
Signed-off-by: Pierre Maurice Schwang <mail@pschwang.eu>

* chore: cleanup cherry-pick issues, migrate to new methods

* chore: add since attributes to deprecated tags, use MathMan instead of Math std lib for rounding ints

* chore: mark custom hashCode + equals implementations diffing from upstream

---------

Co-authored-by: Maddy Miller <mnmiller1@me.com>
2024-05-25 13:36:37 +02:00
Jordan
f9c523c173
feat: move limits for (brush, superpickaxe and normal) radii to fawe (#2635)
- closes #2587
2024-05-24 15:09:57 +02:00
eb204998e9
Merge branch 'IntellectualSites:main' into main 2024-05-20 10:40:17 -05:00
Alexander Brandes
d8eb03f4c1
Release 2.10.0
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-05-19 17:31:14 +02:00
Hannes Greule
a353c12df0
Support for 1.20.5/6 (#2721)
* 1.20.6

Signed-off-by: Alexander Brandes <mc.cache@web.de>

* work

Signed-off-by: Alexander Brandes <mc.cache@web.de>

* More work

Signed-off-by: Alexander Brandes <mc.cache@web.de>

* chore: address more removed fields and methods, make it run

* chore: don't allocate unnecessary arrays (by maps)

* chore: the comment might still be noteworthy

* chore: no need to synchronize twice

* fix obfuscation changes

* remove unneeded deprecation

* make regen work without throwing exceptions - but slow

* fix: error when adapting BaseItemStacks without nbt

* fix annoying paper api breakage

---------

Signed-off-by: Alexander Brandes <mc.cache@web.de>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
2024-05-19 13:32:18 +02:00
Jordan
c9b2f441c1
feat: only unstuck a player if configured to do so (#2723)
- also add unstuck to a couple of other commands
 - closes #2675
2024-05-14 21:30:34 +02:00
Jordan
1d9e8b60ab
fix: add missing blocktypes and some minor cleanup (#2722)
- fixes #2713
2024-05-12 11:05:00 +01:00
Hannes Greule
9bc09c6a4c
Integrate WE Schematic Share system (#2619)
* Integrate WE Schematic Share system

(cherry picked from commit 303f5a76b2df70d63480f2126c9ef4b228eb3c59)

* disable feature for now

---------

Co-authored-by: Madeline Miller <mnmiller1@me.com>
2024-05-12 09:41:48 +01:00
Jordan
debfabff08
feat: introduce migrating config nodes to new locations (#2642)
- Initial case of moving schematic limits from experimental to limits
 - Closes #2533
2024-05-01 17:31:06 +09:00
a75f746156
Merge branch 'IntellectualSites:main' into main 2024-04-21 15:01:41 -05:00
Pierre Maurice Schwang
a0ef151341
Fix heightmap brush with imgur images (#2680)
fix: heightmap brush with imgur / remote images
2024-04-12 20:55:40 +02:00
acadc1ff70
Merge branch 'IntellectualSites:main' into main 2024-04-07 19:55:41 -05:00
Alexander Brandes
5e10c98915
Release 2.9.2
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-04-04 21:56:07 +02:00
9f72054795
Merge branch 'IntellectualSites:main' into main 2024-04-02 13:00:57 -05:00
Alexander Brandes
af547e072c
List FAWE class additions in Javadocs (#2659)
* List FAWE class additions in Javadocs

Signed-off-by: Alexander Brandes <mc.cache@web.de>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/package-info.java

---------

Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-04-01 12:34:19 +02:00
26b1ceca58
Merge branch 'IntellectualSites:main' into main 2024-03-31 17:40:51 -05:00
Jordan
23bcdb0409
fix: introduce approx size to patterns and use in ScatterBrush (#2631)
* fix: introduce approx size to patterns and use in ScatterBrush
 - fixes #2610

* Do not use patternsize in blockvectorset offset
2024-03-30 10:31:52 +01:00
dordsor21
c1c3a5f7ed
fix: git did not find conflict here, remove duplicate fork method 2024-03-27 16:32:11 +00:00
Hannes Greule
7b8c7894ba
Make usage of stateful patterns thread-safe (#2633)
* Make usage of No(Axis)Patterns thread-safe

* make more pattern usage thread-safe

* make more WE patterns thread safe

* remove StatefulPattern
2024-03-27 15:16:06 +01:00
Hannes Greule
8095111eff
Simplify processor ordering (#2651) 2024-03-27 15:15:42 +01:00
Hannes Greule
2dee197f2b
Use correct find class in ExtentTraverser (#2649)
use correct find class in ExtentTraverser
2024-03-24 18:02:16 +01:00
Zeranny
c10f58ac95
Fix Linear pattern index incrementing above array length (#2626)
* Fix index incrementing above array length in async

* Add fork method
2024-03-24 15:49:58 +01:00
Zeranny
9d20df9e6b
Fix queryRel returning data value for block at absolute coordinates (#2645)
* Replace toWorld with toWorldRel for relative data

* re-add accidentally deleted annotation
2024-03-23 20:26:13 +01:00
Pierre Maurice Schwang
68eb24a2f9
fix: imgur image resolution, image input stream reading (#2637) 2024-03-20 23:39:36 +01:00
ee7918043e Merge https://github.com/IntellectualSites/FastAsyncWorldEdit 2024-03-17 14:51:30 -05:00
Jordan
b512182e1f
feat: save region selector to session store (#2621)
* feat: save region selector to session store
 - closes #2397

* Move new gson adapters to FAWE packages
2024-03-17 20:25:43 +01:00
Jordan
d2ca3ed6fe
fix: better image reading errors (#2632)
- closes #2593
2024-03-17 20:25:09 +01:00
Hannes Greule
dc61efe11c
Implement linear patterns using RandomPattern + SimpleRandom (#2630) 2024-03-17 13:17:00 +01:00
Jordan
2d0a3e6081
fix: do not error when attempting to parse "|" as a pattern (#2625) 2024-03-17 13:15:28 +01:00
Alexander Brandes
0db8154546
Drop support for 1.17.1 (#2627)
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-03-17 08:37:03 +01:00
c259540f86
Merge https://github.com/IntellectualSites/FastAsyncWorldEdit 2024-03-16 14:34:54 -05:00
Jordan
f60539f41d
chore: deprecate transform extent for removal (#2623) 2024-03-16 20:12:02 +01:00
Zeranny
37d4e9bb6f
Allow factory suggestions to have parser context (#2613)
* Add context to rich parser

* Description for getSuggestions with context

* Tidy up imports

* Swap which getSuggestions is primary

* Revert "Swap which getSuggestions is primary"

This reverts commit 5c257f60ea9ec002e407b2a4a8a7c6ede6bee5e7.

* Revert default swap and add deprecation note
2024-03-15 18:41:53 +01:00
Hannes Greule
10dc64eeaf
Make sure to process all chunks in PQE even if PARALLEL_THREADS = 1 (#2611)
make sure to process all chunks in PQE even if PARALLEL_THREADS = 1
2024-03-15 18:41:16 +01:00
Jordan
8363badf80
fix: correctly (de)serialise ItemType (#2620)
- InternalId changes depending on ~~magic~~ so we should not store this value
 - fixes #2589
2024-03-15 18:39:35 +01:00
MineFact
df9527b0b7
fix: set and clone Expression Environment after Expression cloning (#2617)
- Fixes #2616
2024-03-15 11:27:25 +01:00
Jordan
facd31ce31
fix: do not forcefully direct to x,y,z methods in AbstractDelegateExtent (#2614)
- we probably shouldn't be doing this
2024-03-14 17:56:08 +01:00
Hannes Greule
641297497a
Maintain insertion order for RandomPattern sub-patterns (#2603) 2024-03-04 07:32:33 +01:00
Hannes Greule
164271374b
Decrease lock contention in SingleThreadQueueExtent (#2594)
* thread local extent

* avoid race conditions due to ChunkHolder pooling

* clean up JFR events, javadoc

* remove ThreadLocalPassthroughExtent
2024-03-04 07:31:56 +01:00
Hannes Greule
f5dfe3ae16
fix rollback database query (#2591) 2024-03-02 13:43:38 +01:00
Hannes Greule
f94b96d5b2
Use actual radius for inverse and adjust inside region check (#2582) 2024-02-18 09:55:06 +01:00
Alexander Brandes
974078c2cd
Release 2.9.2
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-02-06 21:45:25 +01:00
b3346fe67b Merge https://github.com/IntellectualSites/fastasyncworldedit 2024-02-04 13:19:30 -06:00
Jordan
a502287906
refactor: minor adjustments to error handling (ignoring) and blocking queue (#2566) 2024-02-02 18:07:13 +01:00
Jordan
033b8e35d2
fix: always set createCopy status on chunk get as chunks are cached (#2567)
- fixes #2539
2024-02-02 18:06:57 +01:00
Zeranny
763a497cdc
Fix out of bounds error for erode and pull brushes (#2554)
- Fixes #2380
2024-01-28 13:10:48 +01:00
811ed72f64
Merge https://github.com/IntellectualSites/FastAsyncWorldEdit 2024-01-23 19:22:20 -06:00
Jordan
e815071134
fix: fix plot swap (#2360)
- deprecate and note for internal use only Clipboard#create as it's funky
 - fixes #2076
2024-01-21 12:42:24 +01:00
Alexander Brandes
7b4b384df6
Update upstream 2024-01-06 10:53:53 +01:00
637dc2df15
Merge https://github.com/IntellectualSites/FastAsyncWorldEdit 2024-01-02 15:53:42 -06:00
Alexander Brandes
a4a11265ec
Back to snapshot for development 2023-12-22 18:37:07 +01:00
Jordan
28ab5662fd
fix: correct the delegated methods in AbstractDelegateExtent (#2365)
- Not all methods should be overridden: we need to keep delegating-to-setblock methods in parent classes
2023-12-21 13:11:44 +00:00
Jordan
2f92626433
feat: add switch to allow removal of entities on paste (#2525)
- closes #2395
2023-12-18 15:33:02 +00:00
Jordan
6caf4640ea
feat: add config option for if the DOC should lock the file channel (#2526)
- related to #2222
- effectively just a workaround as most people would not need to worry about locking the clipboard file
2023-12-18 15:04:34 +00:00
Jordan
f44b1b48c7
chore: add a more informative error when parsing block properties (#2524) 2023-12-18 14:58:53 +00:00
Jordan
d4b68b384b
fix: add chunk loc to tile entity location when trimming (#2500)
- fixes #2499
2023-12-12 08:00:40 +01:00
6c4d192aa9 Merge https://github.com/IntellectualSites/FastAsyncWorldEdit 2023-12-10 20:35:35 -06:00
Alexander Brandes
605743321f
Add support for 1.20.3 and 1.20.4 (#2512)
* 1.20.3

* 1.20.3 ItemTypes

* 1.20.3

* 1.20.3

* 1.20.4

* Fixup refractions

* Move adapters to _4
2023-12-08 07:30:08 +01:00
RedstoneFuture
ea6138ce1f
Unify the limit permission (#2420) 2023-12-07 18:26:21 +01:00
dordsor21
d1798b7408
chore: remove bad range annotations 2023-11-26 12:28:47 +00:00
Jordan
6722d73c68
fix: fixed history rollback (#2367)
- Also go ahead and clean up other parts of this, with more appropriate operators used
 - Fixes #2366
2023-11-25 20:32:29 +00:00
dordsor21
a64d24c6cf
feat: more informative BoundedHeightMask error message 2023-11-18 15:02:02 +00:00
Hannes Greule
1a7f555add
Use FastSchematicReader by default (#2478) 2023-11-18 14:11:17 +00:00
6485772826
Merge https://github.com/IntellectualSites/FastAsyncWorldEdit 2023-11-13 19:15:11 -06:00
Hannes Greule
46dd71e807
Only unlock if previously locked (#2489) 2023-11-08 20:39:25 +00:00
Alexander Brandes
38fc4cf541
Release 2.8.2 2023-11-03 15:07:12 +01:00
Hannes Greule
462b078c2d
Support -n (select only) in //place (#2475) 2023-11-02 07:52:30 +01:00
Hannes Greule
b8434f891e
Reduce duplicated singleton objects (#2473) 2023-10-29 10:55:50 +01:00
Jordan
36a892eb37
fix: chunks should only be initialised in the getOrCreateChunk method (#2462) 2023-10-26 21:14:39 +02:00
Hannes Greule
256ef74452
Cleanup rawtypes warnings in relighting code (#2472)
remove unneeded generic type
2023-10-26 21:14:27 +02:00
Jordan
50cc9bc528
fix: clear player's history away from main thread if lock locked (#2457)
* fix: clear player's history away from main thread if lock locked
 - addresses crashing of #2448

* Correct lock usage

* remove possibility for race condition
2023-10-23 16:40:38 +02:00
6a5fe3191b Merge https://github.com/IntellectualSites/FastAsyncWorldEdit 2023-10-22 21:20:31 -05:00
Hannes Greule
9fff77c088
Avoid premature trimming in RegionIntersection (#2471)
avoid premature trimming
2023-10-22 16:29:38 +02:00
Jordan
f5803a09f6
fix: vastly superier handling of queue chunks (#2461)
- remove ChunkHolder locking concept as this is no longer needed
 - previously we obtained the copy from chunk GET on finalize, meaning the copy could be replaced by a "newer" one (bad)
 - work around this issue by introducing concept of "unique" keys to map chunk GET copies to
 - correctly handle resetting of various chunk-related classes to actually allow pooling to work
 - remove chunks as they are submitted when flushing a SingleThreadQueueExtenting
2023-10-22 10:04:19 +00:00
Hannes Greule
8c5bb96fdd
Streamline fawe thread names (#2467)
streamline fawe thread names
2023-10-21 17:48:35 +02:00
Zeranny
50ecc5908d
Fix "cleared" ellipsoid/cylinder regions still passing isDefined check (#2465) 2023-10-21 16:27:39 +01:00