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
Jordan
9843bb0188
chore: address deprecations from new records ( #2768 )
...
* Category should implement Keyed
2024-06-12 15:00:40 +02:00
Pierre Maurice Schwang
cd110f537b
chore: replace while loop with simple if as char can be max 2 bytes
2024-06-11 21:33:47 +02:00
Pierre Maurice Schwang
f740ab064a
chore: start on reader (class exists at least)
2024-06-11 19:32:52 +02:00
Pierre Maurice Schwang
7905ee0e86
fix/chore: write pos as doubles
2024-06-10 21:17:27 +02:00
Pierre Maurice Schwang
c35cd6e816
fix: make FastSchematicWriterV3 work
2024-06-10 21:03:42 +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
Pierre Maurice Schwang
ff580218b9
chore: more work on FastSchematicWriterV3
2024-06-09 20:55:20 +02:00
Pierre Maurice Schwang
a9c89616b1
fix: only write into palette once, write into data as varint
2024-06-09 19:03:46 +02:00
Pierre Maurice Schwang
e53d3b6d89
feat: initial work on FastSchematicWriterV2
2024-06-09 18:58:27 +02:00
Pierre Maurice Schwang
1f73309f6f
chore: ensure flushed clipboard in spongev2 writer
2024-06-09 17:31:34 +02:00
Octavia Togami
5ba7b1fe39
Update for final changes
...
(cherry picked from commit 2f6b50a4276b33b615d9dbc52e73e958308735f9)
2024-06-09 17:29:35 +02:00
Octavia Togami
f3216326e6
Fix imports
...
(cherry picked from commit e1892b7bd4ff0ca4592f8cb4e1b2d9363c4cd6ff)
2024-06-09 17:29:21 +02:00
Octavia Togami
ff08ab842a
Licenses lol
...
(cherry picked from commit a5ce8a47657aa987da8ca625cd658856d2eb3477)
2024-06-09 17:29:02 +02:00
Octavia Togami
56ae44b1e2
Update to Sponge Schematic 3
...
Includes a major refactoring of how schematics are read.
(cherry picked from commit bd475b1d4acbcf2a95e5a8f3aee50d2fb2100ae8)
2024-06-09 17:28:43 +02: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
EpicPlayerA10
c095c492e0
fix: normalize layer when setting ordinal to ThreadUnsafeCharBlocks ( #2764 )
...
- fixes #2763
2024-06-07 12:30:31 +02:00
Jordan
5714a52675
fix: correctly trim the max chunk section ( #2753 )
...
- fixes #2727
- fixes IntellectualSites/Plotsquared#4436
2024-06-05 21:23:12 +02:00
dordsor21
a7e4d19605
Remove debug
2024-06-03 22:01:37 +02:00
dordsor21
47b0ece377
Add since tags to new methods
2024-06-03 22:01:37 +02:00
dordsor21
a82ba31185
feat: allow NBT on wand items
...
- closes #2383
2024-06-03 22:01:37 +02:00
