Skip to content

ASP 4.1.0 - 1.21.7#168

Merged
davidmayr merged 15 commits intomainfrom
develop
Jun 30, 2025
Merged

ASP 4.1.0 - 1.21.7#168
davidmayr merged 15 commits intomainfrom
develop

Conversation

@davidmayr
Copy link
Member

This PR contains everything from #161 alongside the following changes:

With SRF 13 being released in develop for a while now without any complaints, it's safe to assume ASP 4.1.0 is stable. Whilst 1.21.7 has not been widely tested yet, there were no changes in server code that could affect ASP.

davidmayr and others added 14 commits May 15, 2025 20:25
…re missing

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
* 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>
* 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>
…ult to vanilla world sea level (Closes #166)

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
… changes, allow sea level modification in plugin config

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
…se variables are difficult to change later

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
* feat(mysql-loader): add constructor that accepts HikariDataSource

* feat(mysql-loader): add ApiStatus.Experimental to constructor
Signed-off-by: David Mayr <davidliebtkekse@gmail.com>

feat: update to upstream paper 57c202e01516b653aea9c7e050eaded1448863e5

Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
kyngs
kyngs previously approved these changes Jun 30, 2025
Copy link
Member

@kyngs kyngs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Paul19988 Paul19988 requested a review from Copilot June 30, 2025 15:31
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates ASP to version 4.1.0 / 1.21.7, adds new world generation options and V13 Slime format support, and includes various bug and performance fixes.

  • Introduced saveBlockTicks, saveFluidTicks, savePoi, and seaLevel settings in the plugin’s world configuration and API
  • Extended Slime format to v13 and updated serializers, readers, and skeletons to handle additional world data (POI sections, block & fluid ticks)
  • Added BStats tracking, spawn-rule fixes, and updated Gradle/Paper dependencies

Reviewed Changes

Copilot reviewed 54 out of 54 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
plugin/src/main/resources/worlds.yml Added commented entries for new save/tick/POI options
plugin/src/main/java/com/infernalsuite/asp/plugin/config/WorldData.java Defined new saveBlockTicks, saveFluidTicks, savePoi, seaLevel settings and mapping
plugin/src/main/java/com/infernalsuite/asp/plugin/commands/sub/CreateWorldCmd.java Extended create command signature for biome/env flags (missing flags for new settings)
api/src/main/java/com/infernalsuite/asp/api/world/properties/SlimeProperties.java Added SEA_LEVEL, SAVE_POI, SAVE_BLOCK_TICKS, SAVE_FLUID_TICKS properties
api/src/main/java/com/infernalsuite/asp/api/world/SlimeChunk.java Added getters for POI sections and tick data
core/src/main/java/com/infernalsuite/asp/skeleton/SlimeChunkSkeleton.java Expanded constructor and getters to include POI and tick data
core/src/main/java/com/infernalsuite/asp/serialization/slime/SlimeSerializer.java Updated v13 serialization to write additional world flags and chunk data
core/src/main/java/com/infernalsuite/asp/serialization/slime/reader/impl/v13 Created v13 world reader and v13AdditionalWorldData enum
loaders/mysql-loader/src/main/java/com/infernalsuite/asp/loaders/mysql/MysqlLoader.java Refactored table initialization into init() and added experimental constructor
gradle/wrapper & gradle libs, properties Bumped Gradle and library versions for 1.21.7
Comments suppressed due to low confidence (2)

plugin/src/main/java/com/infernalsuite/asp/plugin/config/WorldData.java:51

  • The setting key "savePoi" does not match the SlimeProperties constant key "savePOI". Rename the annotation to @setting("savePOI") to ensure proper mapping between config and property.
    @Setting("savePoi")

plugin/src/main/resources/worlds.yml:13

  • [nitpick] Add descriptive comments for the new properties saveBlockTicks, saveFluidTicks, savePoi, and seaLevel to clarify their effects on world saving and behavior.
#     saveBlockTicks: false

super(commandManager);
}

@Command("swp|aswm|swm create <world> <data-source>")
Copy link

Copilot AI Jun 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new worldData fields (saveBlockTicks, saveFluidTicks, savePoi, seaLevel) are not exposed as command flags. Consider adding corresponding @Flag arguments (e.g., --saveBlockTicks, --saveFluidTicks, --savePoi, --seaLevel) and setting them on the WorldData object.

Copilot uses AI. Check for mistakes.
Signed-off-by: David Mayr <davidliebtkekse@gmail.com>
Copy link
Member

@kyngs kyngs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve once again

@davidmayr davidmayr merged commit a4ed86f into main Jun 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants