From 98f495e8e4c2dd245c276587b0c235cb04a767d5 Mon Sep 17 00:00:00 2001 From: Jikoo Date: Fri, 18 Jul 2025 11:20:33 -0400 Subject: [PATCH 1/2] Add 1.21.8 to supported versions --- internal/common/build.gradle.kts | 2 +- internal/spigot/build.gradle.kts | 2 +- .../main/java/com/lishid/openinv/util/InternalAccessor.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/common/build.gradle.kts b/internal/common/build.gradle.kts index 50ca34c0..3d480317 100644 --- a/internal/common/build.gradle.kts +++ b/internal/common/build.gradle.kts @@ -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("spigotRelocations") { diff --git a/internal/spigot/build.gradle.kts b/internal/spigot/build.gradle.kts index bbd662ef..25635da0 100644 --- a/internal/spigot/build.gradle.kts +++ b/internal/spigot/build.gradle.kts @@ -10,7 +10,7 @@ plugins { apply() apply() -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" diff --git a/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java b/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java index dac55cc7..e32cac56 100644 --- a/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java +++ b/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java @@ -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. @@ -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 { @@ -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 From 4b25b7dbbe1dfe3f6c75281f3d24604006848adb Mon Sep 17 00:00:00 2001 From: Jikoo Date: Fri, 18 Jul 2025 11:22:57 -0400 Subject: [PATCH 2/2] Correct resource pack version range Apparently I grabbed the datapack version instead, whoops. Reading clearly was not my strong suit last resource pack update. --- resource-pack/openinv-legibility-pack/pack.mcmeta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resource-pack/openinv-legibility-pack/pack.mcmeta b/resource-pack/openinv-legibility-pack/pack.mcmeta index 9ba4f524..42ae406a 100644 --- a/resource-pack/openinv-legibility-pack/pack.mcmeta +++ b/resource-pack/openinv-legibility-pack/pack.mcmeta @@ -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" }, {