Skip to content

Add 1.21.8 support #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jikoo merged 2 commits into from
Jul 18, 2025
Merged

Add 1.21.8 support #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98f495e
Add 1.21.8 to supported versions
Jikoo Jul 18, 2025
4b25b7d
Correct resource pack version range
Jikoo Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
implementation(project(":openinvapi"))
implementation(project(":openinvcommon"))

paperweight.paperDevBundle("1.21.7-R0.1-SNAPSHOT")
paperweight.paperDevBundle("1.21.8-R0.1-SNAPSHOT")
}

val spigot = tasks.register<ShadowJar>("spigotRelocations") {
Expand Down
2 changes: 1 addition & 1 deletion internal/spigot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
apply<SpigotSetup>()
apply<SpigotReobf>()

val spigotVer = "1.21.7-R0.1-SNAPSHOT"
val spigotVer = "1.21.8-R0.1-SNAPSHOT"
// Used by common adapter to relocate Craftbukkit classes to a versioned package.
rootProject.extra["craftbukkitPackage"] = "v1_21_R5"

Expand Down
6 changes: 3 additions & 3 deletions plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
}

private @Nullable Accessor getAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
Version maxSupported = Version.of(1, 21, 7);
Version maxSupported = Version.of(1, 21, 8);
Version minSupported = Version.of(1, 21, 1);

// Ensure version is in supported range.
Expand All @@ -74,7 +74,7 @@ public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {

// Load Spigot accessor.
if (!PAPER) {
if (BukkitVersions.MINECRAFT.equals(maxSupported)) {
if (BukkitVersions.MINECRAFT.equals(maxSupported) || BukkitVersions.MINECRAFT.equals(Version.of(1, 21, 7))) {
// Current Spigot, remapped internals are available.
return new com.lishid.openinv.internal.reobf.InternalAccessor(logger, lang);
} else {
Expand All @@ -85,7 +85,7 @@ public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {

// Paper or a Paper fork, can use Mojang-mapped internals.
if (BukkitVersions.MINECRAFT.lessThanOrEqual(maxSupported)
&& BukkitVersions.MINECRAFT.greaterThanOrEqual(Version.of(1, 21, 6))) { // 1.21.6, 1.21.7
&& BukkitVersions.MINECRAFT.greaterThanOrEqual(Version.of(1, 21, 6))) { // 1.21.6, 1.21.7, 1.21.8
return new com.lishid.openinv.internal.common.InternalAccessor(logger, lang);
}
if (BukkitVersions.MINECRAFT.equals(Version.of(1, 21, 5))) { // 1.21.5
Expand Down
4 changes: 2 additions & 2 deletions resource-pack/openinv-legibility-pack/pack.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"pack": {
"description": "Improve OpenInv's legibility",
"pack_format": 55,
"supported_formats": [ 34, 81 ]
"supported_formats": [ 34, 64 ]
},
"overlays": {
"entries": [
{
"formats": [ 44, 81 ],
"formats": [ 44, 64 ],
"directory": "openinv_44"
},
{
Expand Down