Skip to content

Spigot/Paper support for 1.21.6 and 1.21.7#4222

Merged
mikeprimm merged 4 commits into
webbukkit:v3.0from
Chaosjan44:v3.0
Jul 8, 2025
Merged

Spigot/Paper support for 1.21.6 and 1.21.7#4222
mikeprimm merged 4 commits into
webbukkit:v3.0from
Chaosjan44:v3.0

Conversation

@Chaosjan44
Copy link
Copy Markdown
Contributor

would at least partially resolve #4221

I'm not sure if I implemented it the "proper" way, but it seems to work fine (only tested it on 1.21.6 since I only changed stuff related to that version.

@Tsoccerguy3
Copy link
Copy Markdown

Looks like 1.21.6 has game breaking bugs . The 1.21.7 should be released next week. 1.21.7 rc2 testing against 1.21.7 Paper API and Server PaperMC/Paper#12741

@Tsoccerguy3
Copy link
Copy Markdown

https://forums.papermc.io/threads/1-21-7.1635/

1.21.7 released

…n't on there (yet) so we need to go through GitHub with auth)
@Chaosjan44 Chaosjan44 changed the title Spigot/Paper support for 1.21.6 Spigot/Paper support for 1.21.6 and 1.21.7 Jun 30, 2025
@Chaosjan44
Copy link
Copy Markdown
Contributor Author

https://forums.papermc.io/threads/1-21-7.1635/

1.21.7 released

thank you for the heads up, support for 1.21.7 is now also added :)

@Tsoccerguy3
Copy link
Copy Markdown

https://forums.papermc.io/threads/1-21-7.1635/
1.21.7 released

thank you for the heads up, support for 1.21.7 is now also added :)

You may want to add the Jar here , until Mike gets around to compile.

@Chaosjan44
Copy link
Copy Markdown
Contributor Author

https://forums.papermc.io/threads/1-21-7.1635/
1.21.7 released

thank you for the heads up, support for 1.21.7 is now also added :)

You may want to add the Jar here , until Mike gets around to compile.

Yeah, I guess I could do that once I'm back from work tomorrow - for now it's linked in the issue that's mentioned up there :)

@Chaosjan44
Copy link
Copy Markdown
Contributor Author

Yeah, I guess I could do that once I'm back from work tomorrow - for now it's linked in the issue that's mentioned up there :)

Wellp, cant upload jar files here, so I guess I'll just drop the link to the jar here

Copy link
Copy Markdown
Contributor

@jacob1 jacob1 left a comment

Choose a reason for hiding this comment

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

Left some review comments with a few things I noticed. Some minor porting issues. The big thing is that I don't think creating two bukkit helpers is necessary, you only need one because 1.21.6 and 1.21.7 are so similar.

Comment on lines +176 to +177
if (bd.a(TagsBlock.t)) { bld.setLog(); } // BlockBehaviour$BlockStateBase.is(OVERWORLD_NATURAL_LOGS)
if (bd.a(TagsBlock.Q)) { bld.setLeaves(); } // BlockBehaviour$BlockStateBase.is(LEAVES)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This should be TagsBlock.an (OVERWORLD_NATURAL_LOGS) and TagsBlock.L (LEAVES)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fixed that, thank you

public Object readTileEntityNBT(Object te, org.bukkit.World w) {
TileEntity tileent = (TileEntity) te;
CraftWorld cw = (CraftWorld) w;
return tileent.a(cw.getHandle().K_()); // TileEntity.saveCustomOnly ; LevelReader.registryAccess
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should be tileent.d (saveCustomOnly) instead of tileent.a (getUpdateTag)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fixed that, thank you :)

Comment thread build.gradle
username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
}
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What is this for? New dependency? Seems roughly the same as before already.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thank you for taking a look :p
it's to get s3-lite, since I couldn't use oss.sonatype.org anymore (they seem to have shut down/moved on the 30th of june.. since s3-lite isn't on the new central repo.
I haven't worked much with repos, so I honestly don't really know it that's the correct or best way to get s3-lite in there again

so not relay a new dependency, just a new way to get it, if there are better ways I'd be happy to implement them :)

}
else if (v.contains("(MC: 1.21.6")) {
BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_6.BukkitVersionHelperSpigot121_6");
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For this PR, you created two separate bukkit helpers, but the api hasn't changed between 1.21.6 and 1.21.7. It's still v1_21_R5 for both versions. I think you should delete one or the other, and use the same helper in both.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

removed the 1.21.6 bukkit helper now :)

@mikeprimm mikeprimm merged commit 4233d3e into webbukkit:v3.0 Jul 8, 2025
@mikeprimm
Copy link
Copy Markdown
Member

Thanks for this!

@xRaccat
Copy link
Copy Markdown

xRaccat commented Jul 31, 2025

any 1.21.8 paper releases?

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.

1.21.6 Support

5 participants