Skip to content

Commit dfe642b

Browse files
committed
Make SpigotAdapter compatible with pre 1.21.5 api
1 parent 54a7622 commit dfe642b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

worldedit-bukkit/adapters/adapter-1_21_5/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ repositories {
1212

1313
dependencies {
1414
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
15-
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.5-R0.1-20250412.175117-4")
15+
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.5-R0.1-20250509.154041-75")
1616
compileOnly(libs.paperlib)
1717
}

worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
import com.sk89q.worldedit.util.formatting.text.serializer.legacy.LegacyComponentSerializer;
3939
import net.md_5.bungee.api.ChatMessageType;
4040
import net.md_5.bungee.api.chat.BaseComponent;
41-
import net.md_5.bungee.chat.ChatVersion;
4241
import net.md_5.bungee.chat.ComponentSerializer;
43-
import net.md_5.bungee.chat.VersionedComponentSerializer;
4442
import org.bukkit.command.CommandSender;
4543
import org.bukkit.entity.Player;
4644

@@ -71,7 +69,11 @@ private static boolean bind() {
7169
final Field gsonField = field(ComponentSerializer.class, "gson");
7270
tmpGson = (Gson) gsonField.get(null);
7371
} catch (NoSuchFieldException ignored) {
74-
tmpGson = VersionedComponentSerializer.forVersion(ChatVersion.V1_21_5).getGson();
72+
Class<?> versionedComponentSerializerClass = Class.forName("net.md_5.bungee.chat.VersionedComponentSerializer");
73+
Class<?> chatVersionClass = Class.forName("net.md_5.bungee.chat.ChatVersion");
74+
var arg = chatVersionClass.getField("V1_21_5").get(null);
75+
var versionedSerializer = versionedComponentSerializerClass.getMethod("forVersion", chatVersionClass).invoke(null, arg);
76+
tmpGson = (Gson) versionedComponentSerializerClass.getMethod("getGson").invoke(versionedSerializer);
7577
}
7678
gson = tmpGson;
7779
// WorldEdit end

worldedit-bukkit/src/test/java/com/sk89q/wepif/TestOfflinePermissible.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ public void setStatistic(
376376
return null;
377377
}
378378

379-
@Override
379+
// @Override
380380
public PersistentDataContainerView getPersistentDataContainer() {
381381
return null;
382382
}

0 commit comments

Comments
 (0)