Pierre Maurice Schwang
ce46993613
Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3
2024-06-27 20:05:47 +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
Pierre Maurice Schwang
5722ea202a
fix: use LinBus in FaweDelegateSchematicHandler
2024-06-26 23:06:12 +02:00
Pierre Maurice Schwang
7e6df48829
fix: remove usages of old nbt types
2024-06-26 23:04:32 +02:00
Pierre Maurice Schwang
5aae0c8494
chore: undo format check on load
2024-06-26 23:00:27 +02:00
Pierre Maurice Schwang
b1e791a81a
chore: update schematic and clipboard logic for linbus changes
2024-06-26 22:59:44 +02:00
Pierre Maurice Schwang
e4faefe7e0
Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3
...
# Conflicts:
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Writer.java
2024-06-26 22:07:21 +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
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
Pierre Maurice Schwang
aa10950def
chore: FAST_V3 not for testing anymore
2024-06-23 18:16:14 +02:00
Pierre Maurice Schwang
6b588ea849
Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3
2024-06-23 18:11:49 +02:00
Pierre Maurice Schwang
ccad4388cd
chore: since comment for reader + writer
2024-06-23 18:11:22 +02:00
Pierre Maurice Schwang
510dee4a49
chore: cleanup
2024-06-23 18:06:02 +02:00
Pierre Maurice Schwang
c039ae8b9b
chore: don't wrap streams unnecessary
2024-06-23 17:14:06 +02:00
Pierre Maurice Schwang
fae46c6e4e
chore/feat: support non-file based inputstreams (using in memory LZ4 cache)
2024-06-22 20:52:20 +02:00
Jordan
4fe9c6bd74
fix: correctly process chunks when using worldguard region blacklists ( #2789 )
...
- fixes #2399
2024-06-21 08:49:09 +02:00
Pierre Maurice Schwang
0f3b81fcd6
chore: constant not required anymore
2024-06-21 00:47:59 +02:00
Pierre Maurice Schwang
84ea606092
Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3
2024-06-21 00:46:24 +02:00
Pierre Maurice Schwang
526c33358c
chore: remove logger warn for now
2024-06-21 00:46:07 +02:00
Pierre Maurice Schwang
408e6fe021
chore: optimize FastSchematicReaderV3
2024-06-21 00:44:52 +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
Pierre Maurice Schwang
ced11b3623
chore: remove debugs
2024-06-18 00:52:17 +02:00
Pierre Maurice Schwang
8de3172941
chore: don't hold a lazyreference (seems harder to gc with already computed value?)
2024-06-18 00:50:57 +02:00
Pierre Maurice Schwang
60cc4244e3
chore/feat: read schematic fully
2024-06-18 00:40:33 +02:00
Pierre Maurice Schwang
7b333a92e3
Merge branch 'main' into feat/spongeSchemV3
2024-06-17 21:31:06 +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
Pierre Maurice Schwang
9bb04492c0
chore: buffer streams in isFormat check
2024-06-16 21:44:32 +02:00
Pierre Maurice Schwang
204a2fc345
chore: add null check again
2024-06-16 18:09:48 +02:00
Pierre Maurice Schwang
b150c69c2a
chore: use the actual FileChannel for mark / reset (if present)
2024-06-16 18:08:29 +02:00
Pierre Maurice Schwang
b4b427b38e
fix: offset must be inverted for origin
2024-06-16 17:29:53 +02:00
Pierre Maurice Schwang
9d7446cec0
Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3
2024-06-16 17:17:33 +02:00
Pierre Maurice Schwang
870a96e9c0
chore/feat: more work on the fast v3 reader
2024-06-16 17:15:35 +02: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
Pierre Maurice Schwang
500812efe1
Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3
...
# Conflicts:
# worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Writer.java
2024-06-12 18:43:40 +02:00
