dordsor21
352d466f7f
Cleanup and add for 1.21
2024-06-30 10:47:18 +01:00
dordsor21
5df7f49cfe
Merge branch 'main' into feat/feature-placement
2024-06-30 10:44:17 +01:00
Alexander Brandes
e3fde6cf82
Back to snapshot for development
...
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-06-30 11:27:51 +02:00
Alexander Brandes
c82ab99a22
Release 2.11.0
...
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-06-30 11:14:40 +02:00
renovate[bot]
04fb55d491
Update dependency gradle to v8.8 ( #2812 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-30 09:00:41 +00:00
renovate[bot]
e8d17fbcd9
Update dependency org.checkerframework:checker-qual to v3.44.0 ( #2813 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-30 08:55:04 +00:00
renovate[bot]
270e1a82a7
Update dependency org.enginehub.lin-bus:lin-bus-bom to v0.1.2 ( #2810 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-30 08:51:37 +00:00
renovate[bot]
1db7df2e2c
Update dependency com.palmergames.bukkit.towny:towny to v0.100.3.3 ( #2809 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-30 08:51:20 +00:00
renovate[bot]
4590dcb006
Update auto.value to v1.11.0 ( #2811 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-30 08:51:05 +00: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
Jordan
ff04c93b48
feat: add option to prevent parsing legacy blocks to the FaweLimit ( #2783 )
...
- Closes #951
2024-06-28 21:46:51 +02:00
Jordan
4853a65e7c
feat: implement graceful world bounds check where appropriate ( #2804 )
...
- closes #2494
2024-06-28 21:46:30 +02:00
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
6dd779f90b
fix: only write copied value if non null ( #2802 )
...
- fixes #2801
2024-06-26 21:12:36 +02:00
Jordan
75af797d4c
fix: extract new config option for deleting disk history on logout ( #2772 )
...
* fix: extract new config option for deleting disk history on logout
- fixes #2663
* Copyto is nullable
2024-06-26 17:32:36 +02:00
renovate[bot]
06bf7104cc
Update dependency com.palmergames.bukkit.towny:towny to v0.100.3.2 ( #2798 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-24 01:39:43 +00: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
5708eb7aa0
fix: correct y index addition in biome history ( #2797 )
2024-06-23 22:33:36 +02:00
Jordan
22b87eb3a5
Merge branch 'main' into feat/feature-placement
2024-06-21 09:18:00 +02:00
Jordan
4fe9c6bd74
fix: correctly process chunks when using worldguard region blacklists ( #2789 )
...
- fixes #2399
2024-06-21 08:49:09 +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
Jordan
d69dc97958
fix: take confirm-large from default limit for unlimited, add option to override ( #2782 )
...
- fixes #2706
2024-06-20 18:24:41 +02:00
Jordan
eaeb3a633a
fix: always init ChunkFilterBlock to the chunk ( #2788 )
...
- rename initFilterBlock from init to create
- remove where we now needlessly init filter blocks
- fixes #2662
2024-06-19 07:38:33 +02:00
Jordan
6a54c5bcb5
fix: recover from trimmed chunk ( #2771 )
...
- It's theoretically possible for the section FULL to return a null layer due to race condition with a trim operation
- Locally cache result and if null, recover
- I just had the error from #1592 again
- This seems to have stopped the error, but adding logging did not log, so possibly some bigger bytecode changes?
- Oh well
2024-06-17 17:40:59 +02:00
renovate[bot]
c7d6c907f1
Update dependency com.palmergames.bukkit.towny:towny to v0.100.3.0 ( #2793 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-06-17 01:44:30 +00: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 2eb6b5a123
2024-06-15 20:53:01 +01:00
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
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
dordsor21
ca8ac01946
Cleanup
2024-06-12 16:02:41 +01: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
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
dordsor21
430520550d
Merge remote-tracking branch 'origin/main' into feat/feature-placement
...
# Conflicts:
# worldedit-core/src/main/java/com/sk89q/worldedit/registry/Keyed.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/gamemode/GameMode.java
# worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherType.java
2024-06-08 09:14:46 +01: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
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
0e87ee5185
Merge branch 'main' into feat/feature-placement
...
# Conflicts:
# worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
2024-06-07 19:17:15 +01:00
dordsor21
a2c0498b0c
Upstream changes, use correct list of cached block changes
2024-06-07 19:14:23 +01:00
