Skip to content

Commit 34f5319

Browse files
authored
Add 1.21.8 support (#321)
* Add 1.21.8 to supported versions * Correct resource pack version range
1 parent 642e287 commit 34f5319

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

internal/common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
implementation(project(":openinvapi"))
3434
implementation(project(":openinvcommon"))
3535

36-
paperweight.paperDevBundle("1.21.7-R0.1-SNAPSHOT")
36+
paperweight.paperDevBundle("1.21.8-R0.1-SNAPSHOT")
3737
}
3838

3939
val spigot = tasks.register<ShadowJar>("spigotRelocations") {

internal/spigot/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
apply<SpigotSetup>()
1111
apply<SpigotReobf>()
1212

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

plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
6464
}
6565

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

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

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

8686
// Paper or a Paper fork, can use Mojang-mapped internals.
8787
if (BukkitVersions.MINECRAFT.lessThanOrEqual(maxSupported)
88-
&& BukkitVersions.MINECRAFT.greaterThanOrEqual(Version.of(1, 21, 6))) { // 1.21.6, 1.21.7
88+
&& BukkitVersions.MINECRAFT.greaterThanOrEqual(Version.of(1, 21, 6))) { // 1.21.6, 1.21.7, 1.21.8
8989
return new com.lishid.openinv.internal.common.InternalAccessor(logger, lang);
9090
}
9191
if (BukkitVersions.MINECRAFT.equals(Version.of(1, 21, 5))) { // 1.21.5

resource-pack/openinv-legibility-pack/pack.mcmeta

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"pack": {
33
"description": "Improve OpenInv's legibility",
44
"pack_format": 55,
5-
"supported_formats": [ 34, 81 ]
5+
"supported_formats": [ 34, 64 ]
66
},
77
"overlays": {
88
"entries": [
99
{
10-
"formats": [ 44, 81 ],
10+
"formats": [ 44, 64 ],
1111
"directory": "openinv_44"
1212
},
1313
{

0 commit comments

Comments
 (0)