Commit Graph

72 Commits

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

* Update adapters
2022-03-14 11:08:10 +01:00
d8c0f8e3b1 Make sure thread-cached arrays are reset 2022-03-13 01:44:59 +00:00
c3cdde9d2e build: Update paperweight 2022-03-10 22:43:33 +01:00
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
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
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
fb66ba6adf build: Update paperweight
Closes #1649
2022-03-07 21:20:25 +01:00
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
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
f0136460ba Update upstream
ab31481 Use Chunk#getNoiseBiome instead of biome container (2025)
2022-01-30 21:18:40 +01:00
6b857b0f58 ci: Cleanup maven repositories (#1526) 2022-01-12 01:21:27 +01:00
f0f201002a Update adapters 2022-01-09 11:22:00 +01:00
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
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
59d4247ddb Update legacy adapters 2022-01-05 23:53:02 +00:00
d6695d23f0 Replace remaining instances of worldeditregentempworld 2022-01-05 23:42:57 +00:00
42dacfc7ef Fix incorrect toNative method in 1.17 adapter 2022-01-04 13:28:29 +00:00
aaad86cf1d docs: Drop clarified todos 2021-12-29 18:16:19 +01:00
867b28d439 Remove remaining keywords frm CachedChanged. IJ doesn't warn? 2021-12-29 16:37:21 +00:00
3a3143065d Remove/add some more comments 2021-12-29 16:29:55 +00:00
ca5640e89e Replace CachedChange class with record 2021-12-29 16:16:23 +00:00
e5cbdec67e Remove unneeded comments 2021-12-29 16:14:13 +00:00
e2a1721a5c Use new language features 2021-12-29 16:12:43 +00:00
0d79d084a5 Rename worldedit to fawe where appropriate 2021-12-29 16:12:16 +00:00
3c2394afa4 Add comments to changed code 2021-12-29 16:06:49 +00:00
f38859237a Move to BinaryTags where appropriate in adapters 2021-12-29 16:00:49 +00:00
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
f9ecb449cf read the actual block from ZeroBitStorage 2021-12-27 06:03:01 +01:00
07695786ca return air instead of reserved on get blocks 2021-12-26 19:52:02 +01:00
a717df3c5f implement 1.18 regen 2021-12-26 16:20:39 +01:00
4ab140f6a1 use spigot-compatible packet constructor 2021-12-26 10:37:32 +01:00
018042769d use spigot-compatible palette constructor 2021-12-26 09:31:03 +01:00
7da921e075 refactor: Deprecate IMP initializors in favor of builders 2021-12-22 20:58:23 +01:00
28f3bc61ea More verbosely get block data and ensure biome layer isn't null 2021-12-21 18:00:09 +00:00
9ec829eddf Update adapters jar 2021-12-21 17:59:55 +00:00
78aff4c81f build: Update paperweight and add 1.17 again 2021-12-21 11:11:08 +01:00
d6e3c331d4 Make 1.18 to be effectively in a usable state (#1452)
* Update swathes of easy-to-update-sort-of-code.
 - Untested
 - Should compile but NMF broken something
 - Several todos:
  - biome history//better support (move to biome sections in core)
  - regen (haha lol no thanks, someone else can do that)
  - probably actually do the palette stuff that probably won't work in PaperweightPlatformAdapter

* ci: Provide basic Jenkinsfile for ghprb pipeline

* build: Update paperweight

* upstream: Update Upstream

de6fa17 Add getBrush helper for use with instanceof pattern matching (1926)

* FAWE will now load on startup

* it....works?

* Begin to allow biome edits (and fix biomes reverting to plains upon editing blocks)

* Add new blocks/block properties

* Only create biome palette if supplies is null

* Fix biome operations

* Finally get removing BlockID done (major version change allows it)

* refactor!: Drop PlotSquared v4

Fawe 2.0.0 and newer requires Java 17, PlotSquared v4 supports 1.13 and 1.14, Fawe wont work on these versions nevertheless and refuses to load due Java version incompatiblities with older versions. Newer versions can use PlotSquared v6.

* docs: Update readme

* Added and removed some comments

* Added and removed some comments

* refactor: Rename worldedit configuration

* build: Re-add 1.17 module

This the a very nasty commit

* chore: Implement missing methods

* build: Update paperweight

* upstream: Update upstream

6df194e Remove finalize, use a Cleaner instead (1943)
9843a4f Fix snapshots in 1.18 (1959)

* ci: Escape workflows

* build: Update paperweight to 1.18.1

* build: Update Paster

* Fix compilation

* Bump to 1.18.1

* Do both 1.18 and 1.18.1

Co-authored-by: Alex <mc.cache@web.de>

* Fix single-block lookups

* Reserve ordinals 0 through 3 for air/"reserved"

* Create block palette data with values

* Fix classpath for testing for starlight

* Correctly use block rather than sky light layer [not used in paper]

Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
2021-12-20 21:12:04 +00:00
c697eb8d41 Merge branch 'main' into major/2.0.0/1.18 2021-12-20 20:28:15 +00:00
9fdff97e29 build: Update paperweight (#1454) 2021-12-10 16:20:15 +01:00
5367921496 fix: Use WE PaperweightAdapter for seed replacement (#1440)
* Use WE PaperweightAdapter for seed replacement
also, only replace when necessary

* fix comments

* ci: Provide basic Jenkinsfile for ghprb pipeline (#1451)

Co-authored-by: Alex <mc.cache@web.de>
2021-12-07 12:59:58 +01:00