Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,655 Commits 1 Branch 0 Tags 50 MiB
705df34c12
Commit Graph

185 Commits

Author SHA1 Message Date
Hannes Greule
6bd1382872
Reuse starlight relighting code across versions (#2474) 2023-10-31 21:00:46 +01:00
Hannes Greule
256ef74452
Cleanup rawtypes warnings in relighting code (#2472) 
remove unneeded generic type
 2023-10-26 21:14:27 +02:00
dordsor21
0566bd359e
fix cursed 1.20.2 adapters 
...what even how did this build??
 2023-10-24 16:46:20 +01:00
Hannes Greule
6dfa7d1732
Fix chunkSource mappings on 1.19.4 (#2469) 
fix chunkSource mappings on 1.19.4
 2023-10-22 12:51:20 +02:00
Jordan
f5803a09f6
fix: vastly superier handling of queue chunks (#2461) 
- remove ChunkHolder locking concept as this is no longer needed
 - previously we obtained the copy from chunk GET on finalize, meaning the copy could be replaced by a "newer" one (bad)
 - work around this issue by introducing concept of "unique" keys to map chunk GET copies to
 - correctly handle resetting of various chunk-related classes to actually allow pooling to work
 - remove chunks as they are submitted when flushing a SingleThreadQueueExtenting
 2023-10-22 10:04:19 +00:00
Jordan
9489e5448f
fix: there is no need to synchronise chunk sending to the chunk GET instance (#2463) 2023-10-22 09:01:44 +02:00
Jordan
c6a9673b4b
fix: avoid tripping async catcher when getting entity from chunk (#2464) 2023-10-18 14:30:22 +01:00
Alexander Brandes
d0d97ce4ca
Update paperweight 2023-10-09 17:58:28 +02:00
Jordan
dccf82ab1b
fix: set villager offers temporarily to save NBT without sending event (#2357) 2023-10-02 20:36:21 +01:00
Alexander Brandes
45b60f4929
Add support for 1.20.2 (#2431) 
* Update to 1.20.2

* Update paperweight

---------

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
 2023-09-29 20:00:58 +00:00
Alexander Brandes
7b0f1b3c5a
Update paperweight 2023-09-16 23:47:19 +02:00
Hannes Greule
f36c5d42c7
Avoid Unsafe usage where possible (#2403) 2023-09-09 16:07:37 +02:00
Hannes Greule
60a3994d62
Clean up some regen code (#2405) 2023-09-09 16:07:29 +02:00
Alexander Brandes
fe33be5795
Update userdev 2023-08-18 13:40:16 +02:00
Alexander Brandes
e81980651e
Cleanup dependencies 2023-08-09 20:52:18 +02:00
Jordan
b1e0ad4ef7
feat: re-submit chunk load request after 10s after checking world is loaded (#2339) 
- #2332 makes it seem like paper forgets to load a chunk sometimes
 - resubmit chunk load request after a second to attempt to counter this
 2023-07-15 16:41:04 +01:00
Jordan
d78092b4ca
fix: ensure chunk is loaded when getting entities (#2323) 2023-07-07 18:36:12 +02:00
dordsor21
a669be2041
fix #2319 2023-07-05 22:03:13 +01:00
Alexander Brandes
770bb0087a
Drop support for minor 1.19 versions (#2316) 
* Drop support for minor 1.19 versions

* More work
 2023-06-29 12:23:26 +02:00
dordsor21
135c77cfb5
chore: minor changes 
- null check get tile in ThreadUnsafeCharBlocks
 - 0 to reserved ID
 2023-06-18 15:03:51 +01:00
Alexander Brandes
7a7373fd3d
Update paperweight 2023-06-17 16:16:16 +02:00
Alexander Brandes
d9463ce8b5
Add support for 1.20.1 2023-06-12 16:36:06 +02:00
Hannes Greule
083f8a4dd8
Set proper field access and use mappings for entities on spigot (#2282) 
set proper field access and use mappings
 2023-06-10 22:47:22 +02:00
Alexander Brandes
e7876c4eba
Update to 1.20 (#2276) 
* Towards 1.20

* Init bukkit

* Update YAML to 2.0

* Fixes for 1.20 adapters

* Update obfuscated field names

* Remove getHandle workaround

* entityManager is obfuscated

* Update paperweight

* [ci-skip] Add 1.20 to modrinth task

---------

Co-authored-by: Phillipp Glanz <p.glanz@madfix.me>
Co-authored-by: SirYwell <hannesgreule@outlook.de>
 2023-06-09 12:53:42 +02:00
Hannes Greule
152d870cdb
Improve exception handling on adapter loading (#2277) 2023-06-08 08:24:44 +00:00
Jordan
5504811f11
chore: minor improvements to processing-related code (#2271) 2023-06-06 19:21:02 +02:00
Jordan
e9fed5a066
feat: improve error when loading biomes (#2241) 2023-06-04 18:50:08 +02:00
EpicPlayerA10
97d4244126
Fix BlockEntity#remove spigot mapping (#2264) 
Fix spigot mapping
 2023-06-04 13:14:50 +00:00
Alexander Brandes
c9a4a9c8b4
Update gradle to 8 (#2262) 
* Update gradle to 8

* Update codeql.yml
 2023-06-04 12:34:03 +02:00
Alexander Brandes
abe120291f
Release 2.6.1 2023-04-23 22:47:30 +02:00
Jordan
8cfb8cb322
chore: add chunk tickets to all chunks accessed (#2163) 
- This isn't necessarily targeting any fix, but I think we should be ensuring a ticket is being added to chunks "access asynchronously", as done by the getChunkAtAsync method
 2023-04-22 09:45:02 +00:00
Hannes Greule
05afaf00a9
Address incompatibilities after CraftChunk changes in spigot (#2179) 2023-04-21 23:21:50 +01:00
Alexander Brandes
2dc8f7bca9
Update paperweight version for 1.19.4 (#2166) 
Update paperweight version
 2023-04-07 15:11:12 +02:00
Alexander Brandes
efc917e6df
Add support for 1.19.4 (#2154) 
* Add paper adapter for 1.19.4

* Add paper module for 1.19.4

* Port 1.19.3 to 1.19.4

* Switch to Paperweight release

* Update worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightAdapter.java

Co-authored-by: Antti Koponen <koponen942@outlook.com>

* Update worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/regen/PaperweightRegen.java

Co-authored-by: Antti Koponen <koponen942@outlook.com>

* Add 1.19.4 to release template

* Update refractions for regen support

* Bump paperweight

---------

Co-authored-by: TheMeinerLP <p.glanz@madfix.me>
Co-authored-by: Antti Koponen <koponen942@outlook.com>
 2023-03-18 15:25:04 +01:00
Alexander Brandes
bfd919b3cb
Update paperweight 2023-03-07 15:39:22 +01:00
Alexander Brandes
b05e64a7ec
Fetch userdev plugin from plugin portal (#2136) 2023-03-07 15:35:33 +01:00
Alexander Brandes
a9ed8431cd
Use the connection field on 1.19->1.19.3 rather than networkManager 2022-12-27 14:05:41 +01:00
Alexander Brandes
b0ac500fa1
Bump paperweight 2022-12-13 22:52:30 +01:00
Alexander Brandes
f98e526fa0
Add support for 1.19.3 (#2042) 
* 1.19.3

* More fixes

* fix: compile time issues for 1.19.3

* fix: new mappings and GeneratorStructureState

* Add 1.19.3 to release and issue template

* Update dependencies for 1.19.3

* Update worldedit-bukkit/adapters/adapter-1_19_3/build.gradle.kts

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
 2022-12-11 18:36:13 +01:00
Alexander Brandes
62f561cb56
Update dev bundle versions (#2040) 2022-12-09 12:38:10 +01:00
Hannes Greule
79c23e06c3
Clean up starlight usage (#2029) 
clean up starlight usage
 2022-12-04 18:56:41 +01:00
Pierre Maurice Schwang
4c2119e404
Fix error on latest paper while copying entities (#2006) 2022-11-10 17:45:35 +00:00
Pierre Maurice Schwang
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
Hannes Greule
13eb1f815f
Fix mappings issue with biome-based regen on 1.18.2 (#1982) 
access correct fields
 2022-10-13 19:20:01 +02:00
Hannes Greule
5da558e24c
feature: support paper chunk system (#1884) 
* avoid usage of ticking chunk future on paper

* fix entity handling

* fix entity handling but on spigot

* seems like no one uses spigot

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-09-04 23:30:32 +02:00
Hannes Greule
a51863c6f0
fix: use proper level data for regen (#1921) 2022-08-27 15:49:01 +01:00
Alexander Brandes
e78277e158
build: Update paperweight (#1901) 2022-08-06 22:41:03 +02:00
Alexander Brandes
a414fd308e
Add 1.19.2 (#1898) 
feat: Add 1.19.2
 2022-08-05 17:05:15 +02:00
Alexander Brandes
50ee45fedd
feat: Add support for 1.19.1 (#1887) 2022-07-28 10:26:43 +02:00
peaches
77a929f6a1
fix: use servers removeGameEventListener instead of reimpl (#1881) 
* fix: use servers removeGameEventListener instead of reimpl

* fix: 1.18.2 impl
 2022-07-25 18:49:10 +02:00
Alexander Brandes
ffd98ad6d9
build: Update paperweight 
Follow up to renovate PR
 2022-06-28 17:38:46 +02:00
Jordan
968799503f
Re-implement full Entity support in history, entity removal, entity creation, etc. (#1812) 
Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-06-21 14:52:02 +01:00
Jordan
dac3610bcf
Implement generation of biome decorations to //regen <biome> and add option for a random seed to be used (#1819) 2022-06-19 22:33:16 +01:00
dordsor21
462bba4f87
Fix biome history on 1.19 2022-06-15 18:52:49 +01:00
Alexander Brandes
1a3b0dc133
chore: Rename legacy adapters artifact to improve matching with FAWE (#1813) 
chore: Rename adapters artifact
 2022-06-14 23:59:53 +02:00
Alexander Brandes
8a85225523
fix: Suppress Tuinity light exception on 1.16 (#1801) 
* fix: Suppress Tuinity light exception on 1.16

Fixes #1591

* chore: mv'd to the right directory
 2022-06-14 09:21:31 +02:00
Alexander Brandes
a6b1b411d5
chore: Update upstream 
3433e40 Fix CB watchdog, fail early if it breaks
 2022-06-13 15:09:24 +02:00
Jordan
63f031b01a
Only synchronise tree generation at the very lowest level (#1788) 
* Only synchronise tree generation at the very lowest level
 - Fixes #1681

* Perform the generate inside try-finally and actually use the resultant copied map to place blocks to the editsession

* Check result of generateTree and return null if failed
 2022-06-13 09:05:18 +02:00
Alexander Brandes
aa94612b70
feat: Add support for 1.19 (#1783) 
* feat: Add support for 1.19

* build: Update paperweight version

* fix: obfuscated names, invalid method signatures

* avoid NPE on config access

* build: Update paperweight

* implement no-op light engine to avoid stalled tasks that never complete

* Apply DelegateSemaphore fixes to 1.19 (#1782)

* Apply DelegateSemaphore fixes to 1.19

* Fixes

* Avoid using PalettedContainerRO#recreate as much as possible. Show an error or warning when we're forced to use it to help fix (#1784)

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
Co-authored-by: SirYwell <hannesgreule@outlook.de>
Co-authored-by: Jordan <dordsor21@gmail.com>
 2022-06-10 23:22:06 +02:00
Jordan
da3fc2e6ea
Fix DelegateSemaphore synchronisation issues on Spigot (#1781) 
* Fix DelegateSemaphore synchronisation issues on Spigot
 - Also effectively nullify it on paper - the synchronisation on the object is enough

* Remove unneeded imports
 2022-06-10 19:50:16 +02:00
Alexander Brandes
c5a50179f2
[ci skip] build: Switch to bom (#1778) 
* build: Switch to bom

* chore: Use javax over checkerframework
 2022-06-10 01:26:48 +02:00
Alexander Brandes
9b3608aada
chore: Update upstream 
c515eb5 Cache properties to reduce startup memory (2103)
 2022-06-10 01:02:03 +02:00
BlockyTheDev
d1f3ac8f76
chore: Update PaperMC repository URL (#1756) 
* Migrate PaperMC Repository Endpoints

* Migrate PaperMC JavaDocs endpoints
 2022-05-21 12:08:10 +02:00
renovate[bot]
617b0ac95c
[ci skip] build: Update dependency io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin to v1.3.6 (#1720) 
* build: Update dependency io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin to v1.3.6

* build: Update paperweight

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
 2022-04-25 17:17:23 +02:00
Octavia Togami
f2df511263
Bump paperdev 1.17.1 version (fixes yarn dependency resolution) 2022-04-23 14:39:26 +01:00
Jordan
65349392a6
Set empty block count when using fastmode on 1.17 (#1710) 
* Set empty block count when using fastmode on 1.17
Fixes #1666

* Update legacy adapters
 2022-04-21 13:11:23 +02:00
Pierre Maurice Schwang
bb71a18c8c
fix: update adapters (FastAsyncWorldEdit-Adapters#67) (#1706) 2022-04-18 21:58:02 +02:00
Hannes Greule
8f1ca48bfc
lock is in PalettedContainer in 1.17 (#1697) 2022-04-11 13:59:37 +02:00
Hannes Greule
a240b002de
simplify biome id logic (#1677) 
Co-authored-by: Alex <mc.cache@web.de>
 2022-04-01 19:25:48 +02:00
Pierre Maurice Schwang
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
Hannes Greule
c45b14a52d
Avoid Unsafe on paper (#1678) 2022-03-27 23:56:59 +02:00
Jordan
465c81d193
Remove hardcoding of heightmap compressed long size (#1668) 2022-03-18 21:28:25 +00:00
Alex
05f80f23b9
refactor!: Don't bundle 1.15.2 adapters anymore (#1656) 2022-03-17 09:41:50 +01:00
Jordan
1708584e8d
Don't call ticking_list on Spigot (#1655) 
* ticking_list is paper only

* Update adapters
 2022-03-14 11:08:10 +01:00
dordsor21
d8c0f8e3b1
Make sure thread-cached arrays are reset 2022-03-13 01:44:59 +00:00
NotMyFault
c3cdde9d2e
build: Update paperweight 2022-03-10 22:43:33 +01:00
Jordan
e9db749e2f
Add fluid ticking and refactor post-processing a bit (#1554) 
* Make postProcessSet a default method and change to void

* Throwable#getMessage is nullable

* Move (re-)ticking to a post-processor per "platform"
 - Add fluid ticking

* chore: Ignore (for us) irrelevant rules

* chore: Fix correct toml syntax?

* Re-add removed method for API-compliance and refactor it to have a use

* Switch to javax annotations

* Switch to recalcBlockCounts for ticking blocks.

* No need to set air count anymore either

* We can still "not tick" in fast mode in 1.17.2

* update adapters

* Let paper create the chunk section if biomes are null

* Adjust notes to settings

* 1.17.2 didn't exist

* Add 1.18.2

* Don't attempt to cache plains biome ID

* Use correct annotation

Co-authored-by: NotMyFault <mc.cache@web.de>
 2022-03-10 15:27:25 +01:00
Alex
5d18e15128
Replace JB occurrences with JSR 305 (for now) (#1651) 
* refactor: Replace JB occurrences with JSR 305 (for now)

* chore: Update adapter jar
 2022-03-10 14:24:44 +01:00
Pierre Maurice Schwang
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
NotMyFault
fb66ba6adf
build: Update paperweight 
Closes #1649
 2022-03-07 21:20:25 +01:00
Alex
345785a25e
feat: Support for 1.18.2 (#1641) 
* feat: Preliminary work for 1.18.2

* Update SpigotNames to 1.18.2 (#1642)

* 1.18.2 / Biome-Holders, regeneration (#1645)

* 1.18.2 / Biome-Holders, regeneration

* fix: reuse old structure sets

* build: Update dev bundles

* fix: Don't log regen world generation

* fix: Run DataConverter with CBT

* fix: Override `#toNativeBinary`

* fix: Exception on regen

Co-Authored-By: Pierre Maurice Schwang <mail@pschwang.eu>

* refactor: Minor cleanup

Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com>
Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
 2022-03-07 15:20:05 +01:00
Jordan
fc2662e51e
Fix //snapshot in 1.18 and re-implement biome/entity restoration (#1620) 
* Re-add "//snap" and "//snapshot"

* Place code in correct method

* Use CompoundBinaryTags in AnvilChunk18 and implement biome/entity restoration

* Address comments

* Fix biome reading

* Fix retrieval of entities from zipped snapshot world

Co-authored-by: Alex <mc.cache@web.de>
 2022-02-24 10:33:25 +01:00
NotMyFault
f0136460ba
Update upstream 
ab31481 Use Chunk#getNoiseBiome instead of biome container (2025)
 2022-01-30 21:18:40 +01:00
Alex
6b857b0f58
ci: Cleanup maven repositories (#1526) 2022-01-12 01:21:27 +01:00
NotMyFault
f0f201002a
Update adapters 2022-01-09 11:22:00 +01:00
Alex
9ba90d8c83
refactor: Drop custom snakeyaml implementation (#1523) 
* refactor: Drop custom snakeyaml implementation

* Merge branch 'main' into chore/main/remove-snakeyaml-wannabe-abstraction
 2022-01-09 10:55:16 +01:00
Alex
64442a8051
refactor: Tackle a few Semgrep and ErrorProne violations (#1520) 
* refactor: Tackle a few Semgrep and ErrorProne violations

* Address comments
 2022-01-07 12:45:53 +01:00
dordsor21
59d4247ddb
Update legacy adapters 2022-01-05 23:53:02 +00:00
dordsor21
d6695d23f0
Replace remaining instances of worldeditregentempworld 2022-01-05 23:42:57 +00:00
dordsor21
42dacfc7ef
Fix incorrect toNative method in 1.17 adapter 2022-01-04 13:28:29 +00:00
NotMyFault
aaad86cf1d
docs: Drop clarified todos 2021-12-29 18:16:19 +01:00
dordsor21
867b28d439
Remove remaining keywords frm CachedChanged. IJ doesn't warn? 2021-12-29 16:37:21 +00:00
dordsor21
3a3143065d
Remove/add some more comments 2021-12-29 16:29:55 +00:00
dordsor21
ca5640e89e
Replace CachedChange class with record 2021-12-29 16:16:23 +00:00
dordsor21
e5cbdec67e
Remove unneeded comments 2021-12-29 16:14:13 +00:00
dordsor21
e2a1721a5c
Use new language features 2021-12-29 16:12:43 +00:00
dordsor21
0d79d084a5
Rename worldedit to fawe where appropriate 2021-12-29 16:12:16 +00:00
dordsor21
3c2394afa4
Add comments to changed code 2021-12-29 16:06:49 +00:00
dordsor21
f38859237a
Move to BinaryTags where appropriate in adapters 2021-12-29 16:00:49 +00:00
Jordan
177d731957
Add back statically-set reserved IDs for air blocks only, make it clear they're "reserved" (#1502) 
* Add back statically-set reserved IDs for air blocks only, make it clear they're "reserved"
Also:
 - Ensure that reserved is never returned in GET block operations
 - "empty" thus doesn't exist in the GET update methods; remove the needless checks
 - Allow GET/SET chunks to determine their own default values for non-present blocks/sections

* Add comments
 2021-12-29 16:17:20 +01:00