Commit Graph

229 Commits

Author SHA1 Message Date
32e2ba6970 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	build.gradle.kts
#	settings.gradle.kts
#	worldedit-bukkit/build.gradle.kts
2024-11-27 23:59:14 +01:00
619867e867 Update dependency paperweight-userdev to v1.21.3-R0.1-20241124.214153-64 (#3010)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-25 00:52:16 +00:00
0acbeb2eec Update dependency paperweight-userdev (#3008)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-24 17:55:11 +00:00
c4267b3746 Send forget packet to avoid invisible chunk sections (#3005) 2024-11-23 22:43:07 +00:00
1cad61c4c4 Update dependency paperweight-userdev to v1.21.3-R0.1-20241119.112919-49 (#3001)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-19 16:18:29 +00:00
7a020f436a Update dependency paperweight-userdev to v1.21.3-R0.1-20241117.183222-36 (#2996)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-18 02:04:54 +00:00
8b18dbcdbd Update dependency paperweight-userdev (#2986)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-11 01:25:50 +00:00
ef8426473a 1.21.3 (#2974)
* feat: initial work on 1.21.3 adapter

* chore: method does not exist anymore

* cleanup, deduplicate, drop old versions from runServer task

* chore: apply deduplicated fields changes from PR

* chore: remove jetbrains annotations references

* chore: remove unsupported versions from modrinth release task

* chore: adjust mondrinth versions, update issue template
2024-11-10 18:13:16 +00:00
bd94632c47 Deduplicate adapter fields into superclass (#2967)
Move common adapter fields into supertype
2024-11-04 11:21:14 +00:00
5121bb8b99 Update dependency paperweight-userdev to v1.21.1-R0.1-20241021.162528-124 (#2957)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-25 18:15:35 +00:00
3806a82f6f Use data version provided by MC (#2955) 2024-10-21 18:16:41 +02:00
91bdd15c18 Update dependency paperweight-userdev to v1.21.1-R0.1-20241012.212042-119 (#2946)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-14 00:46:11 +00:00
b343be40c8 Update dependency paperweight-userdev to v1.21.1-R0.1-20241003.152200-116 (#2942)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 03:42:32 +00:00
7192e147d0 Update dependency paperweight-userdev to v1.21.1-R0.1-20240929.223546-111 (#2935)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-30 01:32:16 +00:00
631269cafe fix: update to changes to spigot chunk future result (#2934) 2024-09-29 18:27:53 +01:00
be32b2264a Bundle dependency updates
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-09-29 15:20:31 +02:00
b4635e85c9 fix: some improvements to GET chunk writing (#2853)
* fix: some improvements to GET chunk writing
 - ensure levelChunk is loaded before giving to copy GET - this is not necessarily guaranteed to be nonnull if two edits overlap. Whilst not advised, such an easy failure should not occur when two edits collide

* Prevent writing chunk sections when FAWE is also sending packets for a chunk and vice versa
- alter IntPair hashcode to be more often unique
- Utilise ConcurrentHashMap for free synchronisation

* Minor comment changes

* Use one-per-world-instance FaweBukkitWorld to store world chunk map
2024-09-25 18:20:49 +01:00
5ac60f0d2e Update dependency paperweight-userdev (#2925)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-23 03:11:40 +00:00
e8c7d67b5b Fix regen on modern versions (#2881)
* work on regen

* simplify

* fix more regen

* cleanup, backport

* revert unneeded change
2024-09-14 10:48:59 +02:00
1e8778b528 Avoid deprecated CompoundTag in API (#2883)
* Avoid deprecated CompoundTag in API

* use javax annotations
2024-09-14 10:47:37 +02:00
19370a3549 fix: account for spigot having private PalettedContainer#get(int) (#2910) 2024-09-14 10:47:07 +02:00
9cf79d0e3b Update dependency paperweight-userdev to v1.21.1-R0.1-20240910.023150-72 (#2907)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-10 03:15:54 +00:00
378334bd75 Avoid map lookup in isMovementBlocker calls (#2906) 2024-09-03 21:39:32 +02:00
b4f4fc63b6 Update dependency paperweight-userdev to v1.21.1-R0.1-20240901.181116-54 (#2905)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-02 00:58:45 +00:00
75fb1cbee7 Update dependency paperweight-userdev (#2896)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 00:42:43 +00:00
acbe2f476a Update dependency paperweight-userdev to v1.21.1-R0.1-20240818.224341-32 (#2885)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 00:48:19 +00:00
5b3291d7c2 Update dependency paperweight-userdev to v1.21.1-R0.1-20240811.223934-9 (#2879)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-12 02:27:12 +00:00
41d294e73b Support 1.21.1 (#2877)
* chore: add support for 1.21.1

* chore: remove old chunk system references in 1.21 adapter (paper)

* chore: re-word exception message
2024-08-11 21:23:45 +02:00
2e1a8f9665 Compile with target java 21, remove unsupported MC versions (#2836)
* Compile with target java 21, remove unsupported MC versions

* update bug report template
2024-07-21 09:19:59 +02:00
1917406334 Update dependency paperweight-userdev to v1.20.6-R0.1-20240702.153951-123 (#2830)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-08 02:12:18 +00:00
5341b06813 Apply hack-fix for biomes to 1.20.6 as well 2024-07-05 17:20:13 +01:00
b511e878a4 chore: throw exception on 1.21 regen 2024-07-02 19:46:33 +01:00
75d9475cf7 Disable regen completely on 1.21 for now 2024-07-02 19:33:35 +01:00
a14bb7ed2c fix: remove synchronisation on chunk GET when sending packet 2024-07-02 18:51:11 +01:00
d9e69cfd58 fix: do not bother with refraction for biomes/i field, this just fixes it now 2024-06-30 21:59:06 +02:00
2ccfd50546 feat: implement 1.21 (#2808)
* feat: implement 1.21

* fix: adjust mojang mapped field name in ChunkMap

* Fix property cache

---------

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
2024-06-30 10:40:13 +02:00
99a58f66cd Fix property loading 2024-06-27 14:59:32 +01:00
fee9029bf0 Add a BiomeCategories API (#2338) (#2777)
* Add a BiomeCategories API (#2338)

* Add a BiomeCategories API

* licenses

* Use a supplier to retain the lazy-load & dynamicness of the existing system, but still retaining the inversion of control that this PR was intended to provide

* Minor fawe adapter cleanup

* Actually add the new files?

* Fixes

---------

Co-authored-by: Maddy Miller <mnmiller1@me.com>
2024-06-27 15:15:14 +02:00
ad5739e014 ref: switch from adventure NBT to LinBus (#2778)
* Switch from adventure NBT to LinBus

* Cleanup

* Clean

* Reimplement NumberTag behaviour

* Use 0.1.0 release

* Fix build, remove fawe tags

---------

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2024-06-26 21:55:47 +02:00
3aa4a4b482 Update dependency paperweight-userdev to v1.20.6-R0.1-20240617.192752-122 (#2799)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-24 01:39:12 +00:00
705df34c12 fix: create new biome paletted container when writing (#2791)
- resizing a paletted container copy alters the original paletted container
 - copy is not clone
 - fixes #2790
2024-06-20 20:49:16 +02:00
7c7118ce26 Update dependency paperweight-userdev to v1.20.6-R0.1-20240615.211816-120 (#2794)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-17 01:44:06 +00:00
5ab79a3f61 ref: biomes refrection works on 1.20.6 2024-06-16 09:24:54 +01:00
49ac08d5b4 Revert "Remove self-refraction-check"
This reverts commit 2eb6b5a12306cc2dc7cfc35e8c03f38ac8f7067c.
2024-06-15 20:53:01 +01:00
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
9843bb0188 chore: address deprecations from new records (#2768)
* Category should implement Keyed
2024-06-12 15:00:40 +02:00
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
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
e044b92d45 Update dependency paperweight-userdev 2024-06-03 03:37:08 +00:00
36d2c85fdb chore: address deprecations in vector classes 2024-05-31 18:52:49 +02:00