Support Sponge Schematic v3 #2776

PierreSchwang · 2024-06-11T17:37:25Z

Overview

WorldEdit's new default schematic is v3 of sponge - the rise of named schematics requires FAWE to follow up.

Description

Adds upstream classes and schematic reader/writer.
Adds FAWE-specific optimized writers / (readers?)
- Writer is faster, especially on larger regions
  - For 300mil blocks WorldEdit's implementation takes about 41s whereas the fast implementation takes about 15s

Submitter Checklist

Give feedback

Make sure you are opening from a topic branch (/feature/fix/docs/ branch (right side)) and not your main branch.
Ensure that the pull request title represents the desired changelog entry.
New public fields and methods are annotated with @since TODO.
I read and followed the contribution guidelines.
Options

Includes a major refactoring of how schematics are read. (cherry picked from commit bd475b1d4acbcf2a95e5a8f3aee50d2fb2100ae8)

(cherry picked from commit a5ce8a47657aa987da8ca625cd658856d2eb3477)

(cherry picked from commit e1892b7bd4ff0ca4592f8cb4e1b2d9363c4cd6ff)

(cherry picked from commit 2f6b50a4276b33b615d9dbc52e73e958308735f9)

github-actions · 2024-06-12T13:02:57Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

# Conflicts: # worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Writer.java

...ore/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicReaderV3.java

…mputed value?)

github-actions · 2024-06-27T13:15:56Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

github-actions · 2024-06-27T13:15:56Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

...ore/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicReaderV3.java

...dedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java

...in/java/com/sk89q/worldedit/extent/clipboard/io/share/BuiltInClipboardShareDestinations.java

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/ReaderUtil.java

...dedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java

…ards

...ore/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicWriterV3.java

…t/clipboard/io/FastSchematicWriterV3.java Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>

itsme-to · 2024-08-21T18:36:45Z

Hey it's make error in loading a lot of schematic, It's don't support well schematic made in v2.

https://paste.itsme.to/toxitefuga.sql

octylFractal and others added 11 commits June 9, 2024 17:28

Update to Sponge Schematic 3

56ae44b

Includes a major refactoring of how schematics are read. (cherry picked from commit bd475b1d4acbcf2a95e5a8f3aee50d2fb2100ae8)

Licenses lol

ff08ab8

(cherry picked from commit a5ce8a47657aa987da8ca625cd658856d2eb3477)

Fix imports

f321632

(cherry picked from commit e1892b7bd4ff0ca4592f8cb4e1b2d9363c4cd6ff)

Update for final changes

5ba7b1f

(cherry picked from commit 2f6b50a4276b33b615d9dbc52e73e958308735f9)

chore: ensure flushed clipboard in spongev2 writer

1f73309

feat: initial work on FastSchematicWriterV2

e53d3b6

fix: only write into palette once, write into data as varint

a9c8961

chore: more work on FastSchematicWriterV3

ff58021

fix: make FastSchematicWriterV3 work

c35cd6e

fix/chore: write pos as doubles

7905ee0

chore: start on reader (class exists at least)

f740ab0

github-actions bot added the Feature This PR adds a new feature label Jun 11, 2024

chore: replace while loop with simple if as char can be max 2 bytes

cd110f5

github-actions bot added the unresolved-merge-conflict label Jun 12, 2024

Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3

500812e

# Conflicts: # worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Writer.java

github-actions bot removed the unresolved-merge-conflict label Jun 12, 2024

dordsor21 linked an issue Jun 14, 2024 that may be closed by this pull request

Add support for sponge schematic v3 #2547

Closed

2 tasks

PierreSchwang added 2 commits June 16, 2024 17:15

chore/feat: more work on the fast v3 reader

870a96e

Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3

9d7446c

dordsor21 reviewed Jun 16, 2024

View reviewed changes

...ore/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicReaderV3.java Outdated Show resolved Hide resolved

PierreSchwang added 9 commits June 16, 2024 17:29

fix: offset must be inverted for origin

b4b427b

chore: use the actual FileChannel for mark / reset (if present)

b150c69

chore: add null check again

204a2fc

chore: buffer streams in isFormat check

9bb0449

Merge branch 'main' into feat/spongeSchemV3

7b333a9

chore/feat: read schematic fully

60cc424

chore: don't hold a lazyreference (seems harder to gc with already co…

8de3172

…mputed value?)

chore: remove debugs

ced11b3

chore: optimize FastSchematicReaderV3

408e6fe

Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3

ce46993

github-actions bot removed the unresolved-merge-conflict label Jun 27, 2024

dordsor21 reviewed Jun 29, 2024

View reviewed changes

PierreSchwang added 3 commits June 30, 2024 01:27

fix: use ReaderUtil again

c63706d

chore: update supported schematic types for Arkitektonika

97e8e95

chore: check for magic bytes in schematic (not tested yet)

01ade09

dordsor21 reviewed Jun 30, 2024

View reviewed changes

...dedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java Show resolved Hide resolved

PierreSchwang added 2 commits June 30, 2024 14:54

revert: magic bytes check

8f4c2d5

fix: fix paletteAlreadyInitialized + biome placement on linear clipbo…

3fbf1cf

…ards

PierreSchwang requested a review from dordsor21 June 30, 2024 17:03

dordsor21 requested a review from a team June 30, 2024 18:51

dordsor21 approved these changes Jun 30, 2024

View reviewed changes

OneLiteFeather mentioned this pull request Jul 1, 2024

Hello! Could Spong or Forge-support be re-added? #2655

Open

dordsor21 requested a review from a team July 2, 2024 18:34

SirYwell requested changes Jul 5, 2024

View reviewed changes

...ore/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicWriterV3.java Outdated Show resolved Hide resolved

PierreSchwang and others added 2 commits July 5, 2024 20:07

Update worldedit-core/src/main/java/com/fastasyncworldedit/core/exten…

f1f5ed1

…t/clipboard/io/FastSchematicWriterV3.java Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>

Merge branch 'main' into feat/spongeSchemV3

a3caeb7

PierreSchwang requested a review from SirYwell July 5, 2024 18:07

NotMyFault approved these changes Jul 6, 2024

View reviewed changes

NotMyFault added Major feature This PR adds a major feature and removed Feature This PR adds a new feature labels Jul 6, 2024

SirYwell approved these changes Jul 10, 2024

View reviewed changes

dordsor21 merged commit 1ec87e7 into main Jul 13, 2024
11 checks passed

dordsor21 deleted the feat/spongeSchemV3 branch July 13, 2024 12:30

Feniksovich mentioned this pull request Aug 25, 2024

Error on loading schematics v2 from URL #2892

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Sponge Schematic v3 #2776

Support Sponge Schematic v3 #2776

PierreSchwang commented Jun 11, 2024 •

edited

Loading

Submitter Checklist

github-actions bot commented Jun 12, 2024

github-actions bot commented Jun 27, 2024

github-actions bot commented Jun 27, 2024

itsme-to commented Aug 21, 2024

Support Sponge Schematic v3 #2776

Support Sponge Schematic v3 #2776

Conversation

PierreSchwang commented Jun 11, 2024 • edited Loading

Overview

Description

Submitter Checklist

github-actions bot commented Jun 12, 2024

github-actions bot commented Jun 27, 2024

github-actions bot commented Jun 27, 2024

itsme-to commented Aug 21, 2024

PierreSchwang commented Jun 11, 2024 •

edited

Loading