Commit Graph

6830 Commits

Author SHA1 Message Date
Jordan
3761b5184c
fix: correctly create Minecraft Structure format schematics (#2787)
- fixes #2784
 - fixes #2785
2024-06-15 15:52:11 +02:00
Jordan
af83b2f9c9
fix: improve biome setting to avoid writing directly to chunk (#2757)
* fix: improve biome setting to avoid writing directly to chunk

 - Removes possibility of writing to the LevelChunkSection biomes PalettedContainer whilst it is being read for sending packets
 - I believe this occured mostly on clipboard operations where blocks are written before biomes, so chunks are being sent whilst writing biomes
 - This would explain why the error reported in the below issue (and others) is/was so rare
 - Of course I could be completely wrong about all of this, but given the line in LevelChunkSection#write that the error seems to consistently occur on is when writing biomes to the packet, and that the only place I can find in FAWE where we write to a "live" PalettedContainer is for biomes, I am reasonably confident that this is the cause
 - Should address #2729

* Remove self-refraction-check
2024-06-15 13:08:42 +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
Jordan
62297f9479
refactor: adjust chunk sending (#2770)
- synchronise on the chunk GET object (when available)
 - kick it off to be run at some point on the main server thread
2024-06-10 19:12:31 +01:00
renovate[bot]
c6e297942f
Update dependency paperweight-userdev to v1.20.6-R0.1-20240604.210637-112 (#2775)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-10 01:54:22 +00:00
renovate[bot]
a87124821f
Update dependency com.palmergames.bukkit.towny:towny to v0.100.2.14 (#2774)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-10 01:53:35 +00: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
renovate[bot]
393ed00524 Update eps1lon/actions-label-merge-conflict action to v3.0.2 2024-06-03 03:38:21 +00:00
renovate[bot]
e044b92d45 Update dependency paperweight-userdev 2024-06-03 03:37:08 +00:00
renovate[bot]
da81530f86 Update dependency net.kyori:adventure-platform-bukkit to v4.3.3 2024-06-03 00:59:02 +00:00
renovate[bot]
c41e38202c Update dependency com.palmergames.bukkit.towny:towny to v0.100.2.12 2024-06-03 00:55:02 +00: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
7318685613
fix: ClassCastException on spigot (#2751)
fix: ClassCastException on spigot due to method change
2024-05-27 21:32:09 +02:00
renovate[bot]
e9866fb4d7 Update dependency commons-cli:commons-cli to v1.8.0 2024-05-27 03:27:39 +00:00
renovate[bot]
df92febf7b Update dependency com.palmergames.bukkit.towny:towny to v0.100.2.11 2024-05-27 00:29:59 +00:00
renovate[bot]
5225dddaa6 Update dependency paperweight-userdev to v1.20.6-R0.1-20240526.222003-87 2024-05-27 00:29:39 +00: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
renovate[bot]
3dc949e383 Update dependency paperweight-userdev to v1.20.6-R0.1-20240520.005421-60 2024-05-20 03:40:38 +00:00
Alexander Brandes
657dbe2146
[ci skip] Back to snapshot for development
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-05-19 17:47:26 +02: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
renovate[bot]
db6442ad35 Update plugin xyz.jpenilla.run-paper to v2.3.0 2024-05-19 14:31:01 +00:00
renovate[bot]
361baef13d Update dependency org.mockito:mockito-core to v5.12.0 2024-05-19 14:28:41 +00:00
renovate[bot]
d17beba7bb Update dependency paperweight-userdev to v1.20.6-R0.1-20240518.202723-58 2024-05-19 14:27:37 +00:00
renovate[bot]
adb045be6a Update dependency net.kyori:adventure-nbt to v4.17.0 2024-05-19 14:27:02 +00:00
renovate[bot]
2285b1dc34 Update adventure to v4.17.0 2024-05-19 14:26:47 +00:00
renovate[bot]
96c324a0ac Update eps1lon/actions-label-merge-conflict action to v3.0.1 2024-05-19 14:26:33 +00:00
renovate[bot]
49ea04574d
Update dependency com.palmergames.bukkit.towny:towny to v0.100.2.9 (#2730)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-19 14:46:38 +02:00
renovate[bot]
9a6aa78ae8
Update dependency com.sk89q.worldguard:worldguard-bukkit to v7.0.10 (#2731)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-05-19 14:46:31 +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
renovate[bot]
ae4d0236cc Update dependency io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin to v1.7.1 2024-05-13 02:00:51 +00:00
renovate[bot]
69dbf760a8 Update dependency com.palmergames.bukkit.towny:towny to v0.100.2.8 2024-05-13 02:00:05 +00: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
renovate[bot]
991d93d8ce Update dependency io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin to v1.7.0 2024-05-06 03:41:37 +00:00