Commit Graph

2699 Commits

Author SHA1 Message Date
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