dordsor21
3e847d05a7
Merge branch 'main' into feat/feature-placement
...
# Conflicts:
# worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightAdapter.java
# worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightAdapter.java
# worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java
# worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R3/PaperweightAdapter.java
# worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
2024-06-27 15:17:37 +01: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
dordsor21
157f651479
Cleanup after merge
2024-06-27 11:51:53 +01:00
dordsor21
a82b591e0f
Merge branch 'main' into feat/feature-placement
2024-06-27 11:46:26 +01: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
Jordan
22b87eb3a5
Merge branch 'main' into feat/feature-placement
2024-06-21 09:18:00 +02: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
dordsor21
49ac08d5b4
Revert "Remove self-refraction-check"
...
This reverts commit 2eb6b5a123
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
dordsor21
b4ed044981
Merge branch 'main' into feat/feature-placement
...
# Conflicts:
# worldedit-core/src/main/java/com/sk89q/worldedit/registry/Category.java
2024-06-12 15:50:48 +01: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
dordsor21
ba30e5a197
Undo
...
Minecraft has a lot of different methods between private and public to determine if structures can be placed. We cannot possibly cover all of them whilst also ensuring issues do not arise with generic "true"s
2024-06-07 20:51:45 +01:00
dordsor21
a2c0498b0c
Upstream changes, use correct list of cached block changes
2024-06-07 19:14:23 +01:00
dordsor21
ef9c2c0bd3
Address vector deprecations
2024-05-31 18:15:56 +01:00
dordsor21
d466e8e488
Merge branch 'main' into feat/feature-placement
2024-05-31 18:04:18 +01:00
dordsor21
36d2c85fdb
chore: address deprecations in vector classes
2024-05-31 18:52:49 +02:00
Jordan
0957d55c6a
Merge branch 'main' into feat/feature-placement
2024-02-04 12:10:34 +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
Pierre Maurice Schwang
ea6bbecc32
Track paperweight-userdev versions with renovate ( #2548 )
...
* fix: editorconfig file selectors
* chore/ci: add renovate checks for paperweight-userdev
2024-01-22 19:14:10 +01:00
dordsor21
fee6c4d79c
bring more in line with upstream
2023-11-23 18:20:09 +00:00
dordsor21
c7f359a794
fix merge issues
2023-11-21 18:14:16 +00:00
Jordan
7150f53572
Merge branch 'main' into feat/feature-placement
2023-11-21 17:32:53 +00:00
Hannes Greule
c0a2eef648
Reuse generateTree code across versions ( #2482 )
2023-11-21 17:26:11 +00:00
Hannes Greule
6bd1382872
Reuse starlight relighting code across versions ( #2474 )
2023-10-31 21:00:46 +01:00
Hannes Greule
256ef74452
Cleanup rawtypes warnings in relighting code ( #2472 )
...
remove unneeded generic type
2023-10-26 21:14:27 +02:00
dordsor21
594527f356
FAWE-inate
2023-10-24 17:32:55 +01:00
Hannes Greule
6dfa7d1732
Fix chunkSource mappings on 1.19.4 ( #2469 )
...
fix chunkSource mappings on 1.19.4
2023-10-22 12:51:20 +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
Jordan
9489e5448f
fix: there is no need to synchronise chunk sending to the chunk GET instance ( #2463 )
2023-10-22 09:01:44 +02:00
Jordan
dccf82ab1b
fix: set villager offers temporarily to save NBT without sending event ( #2357 )
2023-10-02 20:36:21 +01:00
Hannes Greule
f36c5d42c7
Avoid Unsafe usage where possible ( #2403 )
2023-09-09 16:07:37 +02:00
Hannes Greule
60a3994d62
Clean up some regen code ( #2405 )
2023-09-09 16:07:29 +02:00
Alexander Brandes
e81980651e
Cleanup dependencies
2023-08-09 20:52:18 +02:00
Jordan
b1e0ad4ef7
feat: re-submit chunk load request after 10s after checking world is loaded ( #2339 )
...
- #2332 makes it seem like paper forgets to load a chunk sometimes
- resubmit chunk load request after a second to attempt to counter this
2023-07-15 16:41:04 +01:00
Jordan
d78092b4ca
fix: ensure chunk is loaded when getting entities ( #2323 )
2023-07-07 18:36:12 +02:00
dordsor21
a669be2041
fix #2319
2023-07-05 22:03:13 +01:00
dordsor21
135c77cfb5
chore: minor changes
...
- null check get tile in ThreadUnsafeCharBlocks
- 0 to reserved ID
2023-06-18 15:03:51 +01:00
Hannes Greule
083f8a4dd8
Set proper field access and use mappings for entities on spigot ( #2282 )
...
set proper field access and use mappings
2023-06-10 22:47:22 +02:00
Alexander Brandes
e7876c4eba
Update to 1.20 ( #2276 )
...
* Towards 1.20
* Init bukkit
* Update YAML to 2.0
* Fixes for 1.20 adapters
* Update obfuscated field names
* Remove getHandle workaround
* entityManager is obfuscated
* Update paperweight
* [ci-skip] Add 1.20 to modrinth task
---------
Co-authored-by: Phillipp Glanz <p.glanz@madfix.me>
Co-authored-by: SirYwell <hannesgreule@outlook.de>
2023-06-09 12:53:42 +02:00
Hannes Greule
152d870cdb
Improve exception handling on adapter loading ( #2277 )
2023-06-08 08:24:44 +00:00
Jordan
5504811f11
chore: minor improvements to processing-related code ( #2271 )
2023-06-06 19:21:02 +02:00
Jordan
e9fed5a066
feat: improve error when loading biomes ( #2241 )
2023-06-04 18:50:08 +02:00
EpicPlayerA10
97d4244126
Fix BlockEntity#remove spigot mapping ( #2264 )
...
Fix spigot mapping
2023-06-04 13:14:50 +00:00
Alexander Brandes
c9a4a9c8b4
Update gradle to 8 ( #2262 )
...
* Update gradle to 8
* Update codeql.yml
2023-06-04 12:34:03 +02:00
Alexander Brandes
abe120291f
Release 2.6.1
2023-04-23 22:47:30 +02:00
Jordan
8cfb8cb322
chore: add chunk tickets to all chunks accessed ( #2163 )
...
- This isn't necessarily targeting any fix, but I think we should be ensuring a ticket is being added to chunks "access asynchronously", as done by the getChunkAtAsync method
2023-04-22 09:45:02 +00:00
Hannes Greule
05afaf00a9
Address incompatibilities after CraftChunk changes in spigot ( #2179 )
2023-04-21 23:21:50 +01:00
Alexander Brandes
2dc8f7bca9
Update paperweight version for 1.19.4 ( #2166 )
...
Update paperweight version
2023-04-07 15:11:12 +02:00
