3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-17 00:20:09 +01:00
Commit graph

2731 Commits

Autor SHA1 Nachricht Datum
dordsor21
ccdbad967a
Cleanup 2024-09-26 18:56:54 +01:00
dordsor21
7c1c92d6db
Upstream changes, use correct list of cached block changes 2024-09-26 18:53:56 +01:00
dordsor21
c12fa04955
cleanup 2024-09-25 18:53:44 +01:00
dordsor21
d66f5c82fb
FAWE-inate 2024-09-25 18:52:51 +01:00
Madeline Miller
e5e73c4723
Add structure generator command
(cherry picked from commit 5ca80395a35100c2d7686ad8839baaa57f8db07c)
2024-09-25 18:36:50 +01:00
Maddy Miller
17d7850cf3
Add a feature generator and allow undoing of feature placement (https://github.com/EngineHub/WorldEdit/pull/2239)
* Add a feature generator and allow undoing of feature placement [WIP]

Apply changes to Forge as well

Use proper translatable components

* Add a brush version of the feature command

Use Java proxy classes

* Add for Bukkit (only 1.19.3 for now)

Clean up the proxies to use a switch

Checkstyle is grumpy

Add the obfuscated versions

Remove debug text

Fix missed "destroyBlock" deobfuscated proxy function

* checkstyle
2024-09-25 18:36:00 +01:00
Jordan
b4635e85c9
fix: some improvements to GET chunk writing (#2853)
* fix: some improvements to GET chunk writing
 - ensure levelChunk is loaded before giving to copy GET - this is not necessarily guaranteed to be nonnull if two edits overlap. Whilst not advised, such an easy failure should not occur when two edits collide

* Prevent writing chunk sections when FAWE is also sending packets for a chunk and vice versa
- alter IntPair hashcode to be more often unique
- Utilise ConcurrentHashMap for free synchronisation

* Minor comment changes

* Use one-per-world-instance FaweBukkitWorld to store world chunk map
2024-09-25 18:20:49 +01:00
Tyler Resch
8e1922dfe7
fix: apply origin to sponge v3 schematics (#2909)
* fix(#2864)

* Cherry-picked EngineHub/WorldEdit@cfd9eea

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>

* Allow metadata tags to be optional + default value for this.origin

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>

* Correct depth to be default of `0`

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>

---------

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
2024-09-22 22:41:38 +02:00
Jordan
7daafa97f0
fix: adjust linked filter to be left-right and do not link to new forked instances (#2913)
* fix: adjust linked filter to be left-right and do not link to new forked instances
 - Assume that child filters know about their own forks
 - fixes #1874

* Remove appliesChunk|Layer for now
2024-09-21 00:10:39 +02:00
Jordan
393f80165c
fix: add timeout to reading history from exchanger (#2920) 2024-09-19 06:55:53 +02:00
Hannes Greule
7e75ce78ec
Fix tile copying (#2922) 2024-09-18 22:04:56 +01:00
Jordan
d9d5b7b488
feat: improve fawe limits (#2773) (#2858)
* feat: improve fawe limits (#2773)

 - add FaweLimit implementations for increasing concurrency levels
 - allow FaweLimit to perform processing (and forcefully disable as required) to capture [tile] entities
 - Use `BlockVector3#set(Extent orDefault)` where appropriate to reduce block checks
 - fixes #2679
 - fixes #1874

(cherry picked from commit 6052fc3128)

* fix: actually apply a filter if applied from a full region chunk section
 - cannot remember why I made this change in the first place in #2773 but this fixes edits having "empty middles"
 - doesn't seem to have broken anything in testing

* Reduce limit to always atomic
2024-09-17 16:52:46 +01:00
Hannes Greule
71b99f9b05
Revert history writing using LinBinaryIO (#2919) 2024-09-16 19:41:58 +01:00
Alexander Brandes
5ef7461b50
Release 2.11.2
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-09-15 17:20:01 +02:00
Hannes Greule
ea5589b1f0
Introduce basic support for Vector API (#2890)
* Introduce basic support for Vector API

* add modules to javadoc too

* add assumption comments
2024-09-15 17:00:56 +02:00
Jordan
49b063a187
fix: compound tags can be nullable when converting state to baseblock (#2914) 2024-09-15 17:00:17 +02:00
Hannes Greule
1e8778b528
Avoid deprecated CompoundTag in API (#2883)
* Avoid deprecated CompoundTag in API

* use javax annotations
2024-09-14 10:47:37 +02:00
Hannes Greule
766a5d6da2
Faster undo operations (#2898) 2024-09-11 21:27:29 +01:00
Pierre Maurice Schwang
a1bea11c80
fix: allow webinterface schematic format to be detected (#2901)
* fix: allow webinterface schematic format to be detected

* chore: address review
2024-09-11 21:27:21 +01:00
Pierre Maurice Schwang
f771b0cf90
fix: don't process out of bound section while trimming Y sections (#2902)
* fix: don't process out of bound section while trimming Y sections

* fix: handle upper sections

* "fix" macos tests?

* cleanup imports

* update test case(s), fix upper bound(?)

* chore: simplify trim logic
2024-09-11 21:27:12 +01:00
Hannes Greule
5ac4d2fd5f
Replace usages and overrides of deprecated getSuggestions method (#2891) 2024-09-10 09:39:41 +01:00
Pierre Maurice Schwang
6a0b006da6
fix: hollow on large areas fails (#2900)
fix: determine BlockVector3Set by region size for recurse hollow
2024-09-01 11:25:54 +01:00
Pierre Maurice Schwang
f5f9ae6a85
Fix: Copy-Paste-Brush with falsy mask (#2899)
* fix: don't attempt to load all possible world chunks when copy pasta brush empty clipboard

* chore: move check into ResizableClipboardBuilder
2024-08-29 07:18:11 +02:00
Jordan
3b4e849276
chore: warn when both history db and delete disk on logout are enabled (#2824)
* chore: warn when both history db and delete disk on logout are enabled

* Improve message
2024-08-25 16:20:07 +02:00
Alexander Brandes
b5c22d6275
Release 2.11.1
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-08-11 21:37:10 +02:00
Jordan
fcbd346d8f
fix: do not StackOverflow when getting a section in FULL after awkward trim (#2863) 2024-08-07 07:56:33 +02:00
Jordan
f93ad596c6
fix: correctly resolve file if extension is given (#2857)
* fix: correctly resolve file if extension is given

* Adjust error if ClipboardFormats#findByFile null
2024-07-31 21:08:06 +02:00
dordsor21
0301fb0124
Revert "feat: improve fawe limits (#2773)"
This reverts commit 6052fc3128.
2024-07-28 18:36:04 +01:00
Jordan
d1f9d3d6d5
fix: improve FAWE stream history (#2844)
- reset "origin"/relative X/Z when larger than short min/max value so we do not write incorrect positions
 - history size can be larger than int max value
 - fixes #2583
2024-07-28 11:16:25 +02:00
Jordan
6052fc3128
feat: improve fawe limits (#2773)
- add FaweLimit implementations for increasing concurrency levels
 - allow FaweLimit to perform processing (and forcefully disable as required) to capture [tile] entities
 - Use `BlockVector3#set(Extent orDefault)` where appropriate to reduce block checks
 - fixes #2679
 - fixes #1874
2024-07-28 09:53:20 +02:00
Jordan
6fb0102e85
feat: add litematica error when failing to load schematic (#2850)
* feat: add litematica error when failing to load schematic

* Adjust
2024-07-27 10:34:25 +02:00
Jordan
dac7cdbe4b
chore: deprecate FaweApi#load for clipboards as it does not allow closing (#2852) 2024-07-27 10:34:10 +02:00
Jordan
8c3df59413
fix: improve schematic format selection (#2838)
- no longer allow selecting a format specifically because of the generic extension `.schem`
2024-07-25 21:05:16 +02:00
Jordan
ddacb976e4
fix: improve SchemGen, allow null mask (reordered command args) (#2817)
- fixes #2815
2024-07-23 19:53:12 +02:00
Jordan
01273e0ed7
fix: use new index calculations for BlockVectorSet remove (#2842)
- fixes #2841
2024-07-21 14:59:12 +02:00
Zeranny
d2033d49ca
Fix parseFromInput Method for Masks and Patterns When Called via API (#2839)
Explicitly Mask or Pattern in parseFromInput
2024-07-21 09:48:57 +02:00
dordsor21
561ef4afdd
chore: delegate to fast for checking if sponge schematic clipboard format 2024-07-17 20:45:20 +01:00
dordsor21
bf07548695
fix: add some file-extension bounds to schematic loading 2024-07-17 20:41:28 +01:00
dordsor21
b2f36facd8
fix: identify schematic format by file if not specified 2024-07-16 14:50:41 +01:00
Pierre Maurice Schwang
1ec87e7092
Support Sponge Schematic v3 (#2776)
* Update to Sponge Schematic 3

Includes a major refactoring of how schematics are read.

(cherry picked from commit bd475b1d4acbcf2a95e5a8f3aee50d2fb2100ae8)

* Licenses lol

(cherry picked from commit a5ce8a47657aa987da8ca625cd658856d2eb3477)

* Fix imports

(cherry picked from commit e1892b7bd4ff0ca4592f8cb4e1b2d9363c4cd6ff)

* Update for final changes

(cherry picked from commit 2f6b50a4276b33b615d9dbc52e73e958308735f9)

* chore: ensure flushed clipboard in spongev2 writer

* feat: initial work on FastSchematicWriterV2

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

* chore: more work on FastSchematicWriterV3

* fix: make FastSchematicWriterV3 work

* fix/chore: write pos as doubles

* chore: start on reader (class exists at least)

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

* chore/feat: more work on the fast v3 reader

* fix: offset must be inverted for origin

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

* chore: add null check again

* chore: buffer streams in isFormat check

* chore/feat: read schematic fully

* chore: don't hold a lazyreference (seems harder to gc with already computed value?)

* chore: remove debugs

* chore: optimize FastSchematicReaderV3

* chore: remove logger warn for now

* chore: constant not required anymore

* chore/feat: support non-file based inputstreams (using in memory LZ4 cache)

* chore: don't wrap streams unnecessary

* chore: cleanup

* chore: since comment for reader + writer

* chore: FAST_V3 not for testing anymore

* chore: update schematic and clipboard logic for linbus changes

* chore: undo format check on load

* fix: remove usages of old nbt types

* fix: use LinBus in FaweDelegateSchematicHandler

* fix: use ReaderUtil again

* chore: update supported schematic types for Arkitektonika

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

* revert: magic bytes check

* fix: fix paletteAlreadyInitialized + biome placement on linear clipboards

* Update worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicWriterV3.java

---------

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
2024-07-13 14:30:34 +02:00
Jordan
8f353e8f0d
fix: clone polyhedral region last triangle too if present (#2807) 2024-07-05 15:05:55 +02:00
Jordan
c3bb567ea7
fix: switch to 3d where 2d biomes still remain in a couple of places (#2816) 2024-07-02 20:34:11 +02:00
Hannes Greule
eedd8ee044
Use isMovementBlocker() instead of isSolid() in heightmap calculation (#2822) 2024-07-02 20:34:02 +02:00
Jordan
15c6027958
fix: override min/max pos methods from SimpleClipboard (#2803)
- fixes #2800
2024-07-01 16:19:28 +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
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
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
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