Promote 1.21.6 to develop by davidmayr · Pull Request #165 · InfernalSuite/AdvancedSlimePaper

davidmayr · 2025-06-07T15:59:45Z

This PR is tracking the changes of 1.21.6

There are no changes except updating paper.

TODO

Wait for 1.21.6 to be released
Merge in the newest changes from develop

Signed-off-by: David <davidliebtkekse@gmail.com>

… world Signed-off-by: David <davidliebtkekse@gmail.com>

Signed-off-by: David <davidliebtkekse@gmail.com>

# Conflicts: # aspaper-server/src/main/java/com/infernalsuite/asp/SimpleDataFixerConverter.java # aspaper-server/src/main/java/com/infernalsuite/asp/SlimeNMSBridgeImpl.java # gradle.properties

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

Signed-off-by: David Mayr <davidliebtkekse@gmail.com> # Conflicts: # aspaper-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/SerializableChunkData.java.patch # aspaper-server/paper-patches/features/0004-Delete-temp-folder-after-world-is-unloaded.patch # aspaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch # aspaper-server/src/main/java/com/infernalsuite/asp/SimpleDataFixerConverter.java # gradle.properties

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

Signed-off-by: David Mayr <davidliebtkekse@gmail.com> # Conflicts: # aspaper-server/minecraft-patches/features/0004-Prevent-config-disk-io-on-world-load.patch # aspaper-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java.patch # aspaper-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/SerializableChunkData.java.patch # aspaper-server/src/main/java/com/infernalsuite/asp/SimpleDataFixerConverter.java # aspaper-server/src/main/java/com/infernalsuite/asp/level/NMSSlimeChunk.java # gradle.properties

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

kyngs

LGTM

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

* fix: empty compound tags causing null pointers when e.g. heightmaps are missing Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * chore: update paper Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * Additional chunk data with SRF 13 (#161) * feat: begin working on srf 13 Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: moonrise implementation for entity and poi loading, further improvements Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: dont put the wrong DataVersion in the tag when data fixing Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: document format, swap poi chunks around to match read order, allow for future additions to the format Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * chore: javadoc Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * chore: remove some useless things Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: section flags for sky and block light Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: the thing I just fixed for the other formats for SRF 13 Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: potential entity save errors Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: entities not saving in vanilla worlds on autosave Signed-off-by: David Mayr <davidliebtkekse@gmail.com> --------- Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * 1.21.6 (#165) * fix: make asp compile with file patches only on 1.21.5 Signed-off-by: David <davidliebtkekse@gmail.com> * fix: npe on null cache Signed-off-by: David <davidliebtkekse@gmail.com> * fix: paper server feature patches Signed-off-by: David <davidliebtkekse@gmail.com> * feat: port all patches Signed-off-by: David <davidliebtkekse@gmail.com> * chore: add big fat temporary warning and fail if someone loads an old world Signed-off-by: David <davidliebtkekse@gmail.com> * chore: clarify on why saveIncrementally is commented out Signed-off-by: David <davidliebtkekse@gmail.com> * feat: incremental saving is back in paper Signed-off-by: David <davidliebtkekse@gmail.com> * feat: update to newest 1.21.5 commit Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: initial 1.21.6-pre3 work Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: compilation issues on ASP side Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: update to newest paper Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: compilation problems --nobuild Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: lists with multiple types in conversion Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: full 1.21.6 release Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: update paper Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: temporarily downgrade adventure Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: update to newest paper Signed-off-by: David Mayr <davidliebtkekse@gmail.com> --------- Signed-off-by: David <davidliebtkekse@gmail.com> Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: allow changing sea level using a slime property and change default to vanilla world sea level (Closes #166) Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: change the default back to what it was before to avoid breaking changes, allow sea level modification in plugin config Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: properties being accessed before they are ready Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: use bstats server metrics Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * fix: allow animals was not applied Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: allow to specify biome and environment on world creation as these variables are difficult to change later Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * Constructor with custom HikariDataSource for mysql-loader (#167) * feat(mysql-loader): add constructor that accepts HikariDataSource * feat(mysql-loader): add ApiStatus.Experimental to constructor * feat: update to upstream paper 57c202e01516b653aea9c7e050eaded1448863e5 Signed-off-by: David Mayr <davidliebtkekse@gmail.com> feat: update to upstream paper 57c202e01516b653aea9c7e050eaded1448863e5 Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * chore: update adventure Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * feat: 1.21.7 update Signed-off-by: David Mayr <davidliebtkekse@gmail.com> * chore: change api version to release --nobuild Signed-off-by: David Mayr <davidliebtkekse@gmail.com> --------- Signed-off-by: David Mayr <davidliebtkekse@gmail.com> Signed-off-by: David <davidliebtkekse@gmail.com> Co-authored-by: Edoardo Mannino <64657892+HighVirus@users.noreply.github.com>

davidmayr added 11 commits April 2, 2025 12:34

fix: make asp compile with file patches only on 1.21.5

06baf2e

Signed-off-by: David <davidliebtkekse@gmail.com>

fix: npe on null cache

4b940d0

Signed-off-by: David <davidliebtkekse@gmail.com>

fix: paper server feature patches

92779f2

Signed-off-by: David <davidliebtkekse@gmail.com>

feat: port all patches

c72c19d

Signed-off-by: David <davidliebtkekse@gmail.com>

chore: add big fat temporary warning and fail if someone loads an old…

5632a18

… world Signed-off-by: David <davidliebtkekse@gmail.com>

chore: clarify on why saveIncrementally is commented out

cb67298

Signed-off-by: David <davidliebtkekse@gmail.com>

feat: incremental saving is back in paper

af30cca

Signed-off-by: David <davidliebtkekse@gmail.com>

Merge branch 'develop' into dev/1.21.5

2371aa8

# Conflicts: # aspaper-server/src/main/java/com/infernalsuite/asp/SimpleDataFixerConverter.java # aspaper-server/src/main/java/com/infernalsuite/asp/SlimeNMSBridgeImpl.java # gradle.properties

feat: update to newest 1.21.5 commit

86cfd5f

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

feat: initial 1.21.6-pre3 work

d4b2516

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

fix: compilation issues on ASP side

cc4bb33

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

davidmayr mentioned this pull request Jun 7, 2025

Promote 1.21.5 to develop #159

Closed

2 tasks

davidmayr added 5 commits June 11, 2025 12:55

fix: update to newest paper

2f6040b

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

fix: compilation problems --nobuild

f095551

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

fix: lists with multiple types in conversion

584d5fa

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

davidmayr changed the base branch from main to develop June 16, 2025 20:07

davidmayr added 3 commits June 17, 2025 17:23

feat: full 1.21.6 release

b9df68f

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

feat: update paper

7b31d99

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

fix: temporarily downgrade adventure

0575f17

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

davidmayr marked this pull request as ready for review June 17, 2025 18:38

kyngs approved these changes Jun 17, 2025

View reviewed changes

feat: update to newest paper

3e4073b

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

davidmayr merged commit d1c7209 into develop Jun 19, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Promote 1.21.6 to develop #165

Promote 1.21.6 to develop #165
davidmayr merged 20 commits intodevelopfrom
dev/1.21.6

davidmayr commented Jun 7, 2025 •

edited

Loading

Uh oh!

kyngs left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

davidmayr commented Jun 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kyngs left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

davidmayr commented Jun 7, 2025 •

edited

Loading