Commit Graph
38 Commits
Author SHA1 Message Date
Pierre Maurice SchwangandGitHub 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 SchwangandGitHub 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
Pierre Maurice SchwangandGitHub 4b099d3588 fix(GriefDefender): invalidate mask on claim change (#2903) 2024-09-03 23:16:00 +02:00
Pierre Maurice SchwangandGitHub 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 SchwangandGitHub 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
Pierre Maurice SchwangandGitHub 41d294e73b Support 1.21.1 (#2877)
* chore: add support for 1.21.1

* chore: remove old chunk system references in 1.21 adapter (paper)

* chore: re-word exception message
2024-08-11 21:23:45 +02:00
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 <[email protected]>
Co-authored-by: Hannes Greule <[email protected]>
2024-07-13 14:30:34 +02:00
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 <[email protected]>
2024-06-08 09:07:05 +01:00
261ebfa754 feat: schematic share system, add missing Clipboard method for api compat (#2745)
* Allow plugins to register new clipboard share destinations (#1707)

* Allow plugins to register new clipboard share destinations

* Rename file, as per request

* Don't use the base enginehub name for EH_pastebin

* Address review comments

* Fixed wrong usage

* Use a second metadata class for clipboard shares

* Newline

* Address comments

* Improve docs

* Apply suggestions from code review

Co-authored-by: Octavia Togami <[email protected]>

* Use a consumer so that we handle serialization

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/Clipboard.java

Co-authored-by: Octavia Togami <[email protected]>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ClipboardShareDestination.java

Co-authored-by: Octavia Togami <[email protected]>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ShareOutputConsumer.java

Co-authored-by: Octavia Togami <[email protected]>

* Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/share/ShareOutputConsumer.java

Co-authored-by: Octavia Togami <[email protected]>

* Fixed a lot of random comments

* Return a consumer from share rather than a URL, allows the share destination to control output

Co-authored-by: Octavia Togami <[email protected]>

(cherry picked from commit 6e2b0a1df8a6077c3cf8193e38dc9817038bcbe9)

* chore: cleanup cherry-pick remainders

* chore/feat: add ark as (default) schematic paster / sharing endpoint

* chore: default to fast schematic writer in share

* chore: re-format strings.json (seems to adjusted indentation when merging)

* chore: hopefully fixing strings.json (again)

---------

Co-authored-by: Maddy Miller <[email protected]>
2024-06-02 18:21:56 +02:00
Pierre Maurice SchwangandGitHub 7318685613 fix: ClassCastException on spigot (#2751)
fix: ClassCastException on spigot due to method change
2024-05-27 21:32:09 +02:00
c77d34156b Fix compatibility with WorldGuard (#2743)
* Make the Vector classes into Records (#2477)

* Make the Vector classes into Records

* Drop custom equals and hashCode methods in Vector/BlockVector classes

(cherry picked from commit 0df2b6af4c1ce18b77eedd5c62eeb45011512103)
Signed-off-by: Pierre Maurice Schwang <[email protected]>

* chore: cleanup cherry-pick issues, migrate to new methods

* chore: add since attributes to deprecated tags, use MathMan instead of Math std lib for rounding ints

* chore: mark custom hashCode + equals implementations diffing from upstream

---------

Co-authored-by: Maddy Miller <[email protected]>
2024-05-25 13:36:37 +02:00
Pierre Maurice SchwangandGitHub c1e2f23f94 Fix error on adapting custom entities / entity types (#2674)
chore/fix: entity type adaption, more in line with upstream
2024-04-12 20:55:58 +02:00
Pierre Maurice SchwangandGitHub a0ef151341 Fix heightmap brush with imgur images (#2680)
fix: heightmap brush with imgur / remote images
2024-04-12 20:55:40 +02:00
Pierre Maurice SchwangandGitHub 68eb24a2f9 fix: imgur image resolution, image input stream reading (#2637) 2024-03-20 23:39:36 +01:00
Pierre Maurice SchwangandGitHub b93f01c5b3 Update paperweight 1.20.4 - isOpaque does not exist (anymore) (#2629)
* chore/fix: update paperweight 1.20.4 - isOpaque does not exist (anymore)

* chore: update paperweight yet again (i feel scammed)

* chore: missing invert of canOcclude in isTranslucent
2024-03-17 20:25:29 +01:00
Pierre Maurice SchwangandGitHub ea6bbecc32 Track paperweight-userdev versions with renovate (#2548)
* fix: editorconfig file selectors

* chore/ci: add renovate checks for paperweight-userdev
2024-01-22 19:14:10 +01:00
Pierre Maurice SchwangandGitHub f33d93591a Fix Chorus-Plant tree type generation (#2015)
fix: chorusplant tree type must generate inside end_stone
2022-11-14 22:58:54 +01:00
Pierre Maurice SchwangandGitHub 4c2119e404 Fix error on latest paper while copying entities (#2006) 2022-11-10 17:45:35 +00:00
Pierre Maurice SchwangGitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2fe54a04b5 Adjust platform specific code to recent changes (#1997)
* chore: remove usage of MCUtil in StarlightRelighter

* chore: cleanup of unused imports

* hacky shit-fuckery for papers new chunksystem und refactor

* chore: address review comments

* Update dependency io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin to v1.3.9 (#2001)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix: suppress exceptions for field retrieval, cache fields / methods

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-11-02 09:41:20 +01:00
Pierre Maurice SchwangandGitHub 598cd6ba19 Don't error when NPC-annotated "entity" leaves the server (#1969)
fix: no need to remove never-added attachment
2022-10-08 13:34:50 +02:00
Pierre Maurice SchwangandGitHub ab55d07ffd Fix #saturate-Pattern (#1944)
* fix: block type access + resources in #saturate pattern

* chore: no need to download jar file in loadModTextures
2022-09-21 16:17:41 +02:00
Pierre Maurice SchwangandGitHub 39d77091d9 Don't error when loading a schematic fails (#1744)
fix: Throwable#getMessage may be null
2022-05-16 13:23:21 +01:00
Pierre Maurice SchwangandGitHub bb71a18c8c fix: update adapters (FastAsyncWorldEdit-Adapters#67) (#1706) 2022-04-18 21:58:02 +02:00
Pierre Maurice SchwangandGitHub 6e26741fdc fix: respect block categories in RichMaskParser (#1694) 2022-04-11 13:59:54 +02:00
Pierre Maurice SchwangandGitHub 2483eacff5 Fix memory leak by Citizen NPCs (#1693)
* fix: ignore uuid v2 for BukkitPermissionAttachmentManager

Fixes a memory leak that attaches and caches PermissionAttachments to NPCs. Citiziens uses version 2 UUIDs, which are not used for regular player uuids. Those v2 uuids are now excluded.

* fix: create Permission when required

* fix: use citizens documented way to check for NPCs
2022-04-06 16:22:53 +02:00
Pierre Maurice SchwangandGitHub 2276d82d2c //regen creates vanilla decorations without error (#1650)
* fix: Feature placement on regen should create chunk

* feat: update adapter jar

* fix: update adapter jar
2022-03-28 21:06:26 +02:00
Pierre Maurice SchwangandGitHub d1588f9207 Fix tabcomplete for random pattern / multiple pattern (#1675)
* Merge RandomPatternParser#getSuggestions with upstream

* fix: don't throw AIIBE if patterns are empty

shouldn't be the case in the first place
2022-03-27 09:46:36 +02:00
Pierre Maurice SchwangandGitHub 49bc675f51 Fix //regen -b on 1.18.2 (#1647)
* fix: adapt correct biome type

* fix: PaperweightPlatformAdapter#adapt should return BiomeType
2022-03-08 18:55:52 +01:00
Pierre Maurice SchwangandGitHub 668227ee6c Update Upstream (#1643)
44863cf Don't access PluginClassLoader directly (#2045)
2022-03-05 18:19:58 +01:00
Pierre Maurice SchwangandGitHub f657a80dc6 fix: set size of MappedByteBuffer accordingly (#1608) 2022-02-13 13:57:19 +01:00
Pierre Maurice SchwangandGitHub 646a683f22 fix: add coordinates to tile-entity nbt component (#1607) 2022-02-12 13:38:37 +01:00
Pierre Maurice SchwangandGitHub c4d0a4e921 Update adapters (#1394) 2021-11-02 22:05:04 +01:00
14cb97d0ad fix: //regen with custom populators (#1376)
* Refraction + more fixes

* Remove exception debug

* Fix populator issues with //regen

* Fixed code style

* Further simplify

* Update adapters

Co-authored-by: Alex <[email protected]>
2021-10-25 14:13:02 +00:00
Pierre Maurice SchwangandGitHub c7a490fa03 Fix paperweight changes (#1364) 2021-10-18 20:38:43 +01:00
2eb6451810 fix: Add dummy constructor for CraftBook5 support (Fixes #1334) (#1344)
Co-authored-by: NotMyFault <[email protected]>
2021-10-07 17:18:10 +00:00
Pierre Maurice SchwangandGitHub 546ad86841 fix: Update StubServer.java to the latest spigot changes (#1345) 2021-10-07 18:05:56 +01:00
7d3a9ff36d Fixed Unit Tests (BlockVector3.isLongPackable) (#1168)
* Fixed Unit Tests (BlockVector3.isLongPackable)

* Re-enable tests for ci

* Address gh action dependency complaints

* Fix "invalid usage of tag &" for MinecraftVersion.java

* Simple StubServer for BukkitWorldTest.java

* Add parallelgzip to test runtime, fixed javadoc encoding, make gradlew executable and patch StubServer for latest spigot / paper release

* Move Javadoc UTF-8 to PlatformConfig.kt

* Revert "make gradlew executable"
Was required for act to run, but not required for GH actions - Weird behavior

* Mark upstream changes, move class + apply editorconfig

Co-authored-by: NotMyFault <[email protected]>
Co-authored-by: Matt <[email protected]>
2021-08-10 09:31:37 +01:00
Pierre Maurice SchwangandGitHub 036e8473b4 Fix unit tests + Version Determination (#1055)
* Fixed unit tests and determine chunksStretched based on package version

* Fixed requested changes
2021-05-07 23:47:35 +02:00