Skip to content

Commit b8e9191

Browse files
committed
refactor(reflection): replace NMS reflection with Spigot and Paper API
1 parent 347234c commit b8e9191

13 files changed

Lines changed: 127 additions & 497 deletions

File tree

bukkit/src/main/java/com/nickuc/openlogin/bukkit/reflection/BukkitReflection.java

Lines changed: 0 additions & 190 deletions
This file was deleted.

bukkit/src/main/java/com/nickuc/openlogin/bukkit/serializer/chat/ChatComponentSerializer.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

bukkit/src/main/java/com/nickuc/openlogin/bukkit/ui/chat/ActionbarAPI.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,4 @@ static ActionbarAPI getApi() {
3737
default void reset(Player player) {
3838
send(player, "");
3939
}
40-
4140
}

bukkit/src/main/java/com/nickuc/openlogin/bukkit/ui/chat/ActionbarAPIHolder.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
package com.nickuc.openlogin.bukkit.ui.chat;
2626

27-
import com.nickuc.openlogin.bukkit.ui.chat.impl.PacketActionbarImpl;
2827
import com.nickuc.openlogin.bukkit.ui.chat.impl.SpigotActionbarImpl;
2928

3029
public class ActionbarAPIHolder {
@@ -34,13 +33,14 @@ public class ActionbarAPIHolder {
3433
static {
3534
try {
3635
api = new SpigotActionbarImpl();
37-
} catch (Throwable ignored) {
38-
try {
39-
api = new PacketActionbarImpl();
40-
} catch (Throwable ignored2) {
41-
api = (player, message) -> {
42-
};
43-
}
36+
} catch (ReflectiveOperationException ignored) {
37+
// Spigot Actionbar API is not available, fall back to the default no-op implementation
38+
}
39+
40+
if (api == null) {
41+
api = (player, message) -> {
42+
// Default no-op implementation
43+
};
4444
}
4545
}
4646

bukkit/src/main/java/com/nickuc/openlogin/bukkit/ui/chat/impl/PacketActionbarImpl.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)