Commit graph

213 Commits

Autor SHA1 Nachricht Datum
renovate[bot]
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
renovate[bot]
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
Jordan
631269cafe
fix: update to changes to spigot chunk future result (#2934) 2024-09-29 18:27:53 +01:00
Alexander Brandes
be32b2264a
Bundle dependency updates
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-09-29 15:20:31 +02:00
Jordan
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
renovate[bot]
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
Hannes Greule
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
Hannes Greule
1e8778b528
Avoid deprecated CompoundTag in API (#2883)
* Avoid deprecated CompoundTag in API

* use javax annotations
2024-09-14 10:47:37 +02:00
Jordan
19370a3549
fix: account for spigot having private PalettedContainer#get(int) (#2910) 2024-09-14 10:47:07 +02:00
renovate[bot]
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
Hannes Greule
378334bd75
Avoid map lookup in isMovementBlocker calls (#2906) 2024-09-03 21:39:32 +02:00
renovate[bot]
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
renovate[bot]
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
renovate[bot]
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
renovate[bot]
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
Pierre Maurice Schwang
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
Hannes Greule
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
renovate[bot]
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
dordsor21
5341b06813
Apply hack-fix for biomes to 1.20.6 as well 2024-07-05 17:20:13 +01:00
dordsor21
b511e878a4
chore: throw exception on 1.21 regen 2024-07-02 19:46:33 +01:00
dordsor21
75d9475cf7
Disable regen completely on 1.21 for now 2024-07-02 19:33:35 +01:00
dordsor21
a14bb7ed2c
fix: remove synchronisation on chunk GET when sending packet 2024-07-02 18:51:11 +01:00
Jordan
d9e69cfd58
fix: do not bother with refraction for biomes/i field, this just fixes it now 2024-06-30 21:59:06 +02:00
Jordan
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
dordsor21
99a58f66cd
Fix property loading 2024-06-27 14:59:32 +01:00
Jordan
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
Jordan
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
renovate[bot]
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
Jordan
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
renovate[bot]
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
dordsor21
5ab79a3f61
ref: biomes refrection works on 1.20.6 2024-06-16 09:24:54 +01:00
dordsor21
49ac08d5b4
Revert "Remove self-refraction-check"
This reverts commit 2eb6b5a12306cc2dc7cfc35e8c03f38ac8f7067c.
2024-06-15 20:53:01 +01: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
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]
e044b92d45 Update dependency paperweight-userdev 2024-06-03 03:37:08 +00: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]
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
renovate[bot]
3dc949e383 Update dependency paperweight-userdev to v1.20.6-R0.1-20240520.005421-60 2024-05-20 03:40:38 +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
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
renovate[bot]
3c206f44a5 Update dependency paperweight-userdev to v1.20.4-R0.1-20240424.165410-174 2024-04-29 01:20:19 +00:00
renovate[bot]
3dfc4f8f79 Update dependency paperweight-userdev to v1.20.4-R0.1-20240420.200855-173 2024-04-20 21:36:28 +00:00
renovate[bot]
fdd6b86aeb Update dependency paperweight-userdev to v1.20.4-R0.1-20240420.181647-171 2024-04-20 18:59:41 +00:00
renovate[bot]
a383251596 Update dependency paperweight-userdev to v1.20.4-R0.1-20240420.033107-168 2024-04-20 05:15:50 +00:00
renovate[bot]
65fd331232 Update dependency paperweight-userdev to v1.20.4-R0.1-20240419.201130-167 2024-04-19 22:15:29 +00:00
renovate[bot]
7afebdbc61 Update dependency paperweight-userdev to v1.20.4-R0.1-20240416.195429-165 2024-04-16 22:33:23 +00:00