Commit Graph

5029 Commits

Author SHA1 Message Date
MattBDev d691cf40f3 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit 2021-01-06 13:34:42 -05:00
dordsor21 8f74186e14 *BaseBlocks are immutable 2021-01-06 18:15:59 +00:00
dordsor21 7afddcc411 Fix more NBT mutability issues 2021-01-06 18:00:40 +00:00
MattBDev 653d362806 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit 2021-01-06 12:53:34 -05:00
Aurora 1b870c5d78 Upstream/add missing y variable to generate biome (#824)
* Add the missing y variable to generate biome

* Remove unused imports

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-01-06 16:57:59 +00:00
dordsor21 e40e86df5f Add some more __internal__ <-> air logi
Fixes #831
2021-01-06 16:40:28 +00:00
dordsor21 336b90be15 Also fix CPUOptimizedClipboard 2021-01-06 13:39:25 +00:00
dordsor21 280ade9994 fix NBT in memory optimized clipboard 2021-01-06 13:29:52 +00:00
dordsor21 91de441403 No need to check WorldEdit schematics for bad entities 2021-01-05 17:21:35 +00:00
dordsor21 6db588a19f Don't allow FAWE to "deadlock" itself when post-processing history by switching to the primary ForkJoinPool
- With enough chunks waiting to write to history, it's possible to fill the secondary fork pool up with locked threads, and thus prevent any threads from actually writing their history.
2021-01-05 16:42:53 +00:00
dordsor21 89cc2f9d9f Large memory use reduction when PostProcessing history 2021-01-05 15:03:47 +00:00
dordsor21 7c174ee6b3 Return to static "sections" in CharBlocks.
- Synchronise (lock) outside the static object
 - Reduces object creation
2021-01-05 13:51:26 +00:00
Hannes Greule aece0229c4 Properly repeat extents for negative coordinates (#825)
An extent's content was returned flipped when applied for negative positions, as e.g. `Math.abs(-2) % 3` returns 2 instead of 1 (as 1 + -1 * 3 = -2)

(cherry picked from commit b0cf5dd2bf1b9bcbf1c7efff0fe25de7ee9a2090)
2021-01-05 14:01:11 +01:00
dordsor21 bfd04e4155 Revert "~1/3 faster history writing with small caching"
This reverts commit 836b7a9750.
2021-01-05 00:50:26 +00:00
dordsor21 836b7a9750 ~1/3 faster history writing with small caching 2021-01-04 21:25:29 +00:00
dordsor21 916c080310 5000th commit: Fix //download 2021-01-04 19:10:10 +00:00
Alexander Söderberg 3f0b9a2a92 Reorder BuildInClipboardFormat and document changed JNBT classes (#807)
* Get rid of FastSchematicReader/Writer and document changed JNBT classes

This commit includes changes from upstream to the schematic classes
(`com.sk89q.worldedit.extent.clipboard.io`). It also documents the JNBT
classes, specifying what has been changed in FAWE. This was done in preparation
for the upcoming move to adventure-nbt.

The PlotSquared schematic handler classes will now use SpongeSchematicReader/Writer rather than FastSchematicReader/Writer.

This is yet untested and the entire branch is a W.I.P.

* Fix JNBT mutability misuse in FAWE

FAWE previously had mutable compound and list tags. The previous commit changed that, and this commit will fix misuse of the tag API.

I've tried to identify the places where mutability was assumed, but I might have missed something. This needs quite extensive testing.

This is yet another change which increases upstream compatibility in FAWE.

* Fix FAWE_Spigot_<..>#getEntity

* Fix JNBT usage in the AsyncBlockState code

* Readd FastSchematicReader/Writer and add a new schematic format (`FAST`)

* Update dead repository

* Implement missing AsyncChunk#getTileEntities

* handle entities properly and add "brokenentity" format

* Fix fast schematic reader
lazily reading means it's read in order of appearance in the inputstream so we need to read schematic version first (skip past everything) and then reset the stream

* Fix p2 FAWE

* Go back to fast schematics in P2/CompressedSchematicTag (#819)

* Fix compile

Co-authored-by: N0tMyFaultOG <mc.cache@web.de>
Co-authored-by: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
Co-authored-by: Aurora <aurora@relanet.eu>
2021-01-04 19:18:23 +01:00
dordsor21 efcca5b66f it's better not to bother with tickets to avoid tickets not being removed all the time 2021-01-01 19:49:11 +00:00
dordsor21 580cb4a91e add chunk tickets and don't force sync sending chunk packets 2021-01-01 18:04:30 +00:00
dordsor21 39b0da2b99 we do want to synchronise across the chunk when loading sections 2021-01-01 17:19:14 +00:00
dordsor21 42346b429b Don't synchronise across the entire edit for a single ChunkSection load (speed boost) 2021-01-01 16:48:17 +00:00
dordsor21 606cfa5cbc we don't need to "update" when copying sections 2021-01-01 16:07:57 +00:00
dordsor21 fbfe3221d7 Fix fast schematic reader/writer
- Have both sponge and fast r/w available but default to "fast"
 - Correctly "offset" entities in the schematic, and add a legacy mode for loading old FAWE schematics with entities required.
 - Lazily reading means it's read in order of appearance in the inputstream so we need to read schematic version first (skip past everything) and then reset the stream. Fixes #740
 - Add an FAWEVersion to the metadata
 - Correctly actually return a BlockArrayClipboard when required. Fixes #454
2021-01-01 15:01:35 +00:00
dordsor21 82f640d132 fix loading Fawe.properties 2020-12-31 17:45:07 +00:00
dordsor21 59c227b49a actually fix AsyncBlock 2020-12-31 15:32:00 +00:00
dordsor21 935130aa0e Fix AsyncBlock 2020-12-31 15:22:29 +00:00
dordsor21 df48b7e81d stop bottling clipboard sizes for no reason 2020-12-31 15:01:54 +00:00
Alexander Söderberg 71059505d1 Implement missing AsyncChunk#getTileEntities 2020-12-27 22:19:04 +01:00
dordsor21 6e49427b26 fix WNA 2020-12-27 21:03:09 +00:00
dordsor21 3c5041ddb7 Fix uploading/download P2 schematics with /plot save|load 2020-12-24 15:47:02 +00:00
dordsor21 b60d9ef6d5 Fix #787 2020-12-23 17:26:26 +00:00
N0tMyFaultOG 7236f1d6fa Update zStandard jni 2020-12-22 11:57:12 +01:00
Renovate Bot bbc0ea0f35 Update dependency com.github.luben:zstd-jni to v1.4.8-1 2020-12-21 20:06:43 +00:00
N0tMyFaultOG 9f2baf71f7 Remove unnecessary version check
Due the provided scope and api-version it won't load on older versions anyway
2020-12-21 19:43:23 +01:00
N0tMyFaultOG 27512ceab3 Don't shade metrics twice 2020-12-21 19:40:06 +01:00
N0tMyFaultOG 44f15da5a3 Update Paster 2020-12-21 15:57:57 +01:00
renovate[bot] be05ae9230 Update dependency net.java.truevfs:truevfs-profile-default_2.13 to v0.12.2 (#796)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 11:40:00 +01:00
NotMyFault a32f3b0e8c Exclude dependencies from renovate 2020-12-21 11:17:46 +01:00
renovate[bot] 73406b2e15 Update dependency gradle to v6.7.1 (#794)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:57:19 +01:00
renovate[bot] 7928479046 Update dependency de.schlichtherle:truezip to v6.8.4 (#793)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:55:46 +01:00
N0tMyFaultOG f36afe1907 Paperlib 1.6 2020-12-21 10:52:15 +01:00
N0tMyFaultOG 675777190f Merge remote-tracking branch 'origin/renovate/io.papermc-paperlib-1.x' into main 2020-12-21 10:51:46 +01:00
N0tMyFaultOG b3ecbe8c95 bStats 1.8 2020-12-21 10:50:12 +01:00
N0tMyFaultOG 3954953d0d Merge remote-tracking branch 'origin/renovate/org.bstats-bstats-bukkit-1.x' into main 2020-12-21 10:49:32 +01:00
renovate[bot] 2f23643635 Update dependency org.slf4j:slf4j-api to v1.7.30 (#803)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:47:07 +01:00
renovate[bot] f6cbde6386 Update dependency org.yaml:snakeyaml to v1.27 (#804)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:44:31 +01:00
Renovate Bot d77e16c66f Update dependency org.bstats:bstats-bukkit to v1.8 2020-12-21 02:36:35 +00:00
Renovate Bot 79f825d21a Update dependency io.papermc:paperlib to v1.0.6 2020-12-21 00:37:05 +00:00
renovate[bot] 2eb4f14724 Update dependency com.plotsquared:PlotSquared-Core to v5.13.3 (#791)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-20 23:35:57 +01:00
renovate[bot] aca45e4ab0 Update dependency com.comphenix.protocol:ProtocolLib to v4.5.1 (#789)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-20 23:15:24 +01:00