Skip to content

Commit 5d7d370

Browse files
committed
add a new tablist handler for 1.21.4
1 parent ecbe3e5 commit 5d7d370

File tree

9 files changed

+1217
-4
lines changed

9 files changed

+1217
-4
lines changed

TabOverlayCommon

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010

1111
ext {
1212
spigotVersion = '1.11-R0.1-SNAPSHOT'
13-
bungeeVersion = '1.20-R0.2-SNAPSHOT'
13+
bungeeVersion = '1.21-R0.1-SNAPSHOT'
1414
spongeVersion = '7.0.0'
1515
dataApiVersion = '1.0.2-SNAPSHOT'
1616
}

bungee/src/main/java/codecrafter47/bungeetablistplus/handler/OrderedTabOverlayHandler.java

Lines changed: 1187 additions & 0 deletions
Large diffs are not rendered by default.

bungee/src/main/java/codecrafter47/bungeetablistplus/managers/TabViewManager.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,11 @@ private PlayerTabView createTabView(ProxiedPlayer player) {
140140
Logger logger = new ChildLogger(btlp.getLogger(), player.getName());
141141
EventLoop eventLoop = ReflectionUtil.getChannelWrapper(player).getHandle().eventLoop();
142142

143-
if (protocolVersionProvider.has1193OrLater(player)) {
143+
if (protocolVersionProvider.has1214OrLater(player)) {
144+
OrderedTabOverlayHandler handler = new OrderedTabOverlayHandler(logger, eventLoop, player);
145+
tabOverlayHandler = handler;
146+
packetHandler = new RewriteLogic(new GetGamemodeLogic(handler, (UserConnection) player));
147+
} else if (protocolVersionProvider.has1193OrLater(player)) {
144148
NewTabOverlayHandler handler = new NewTabOverlayHandler(logger, eventLoop, player);
145149
tabOverlayHandler = handler;
146150
packetHandler = new RewriteLogic(new GetGamemodeLogic(handler, (UserConnection) player));

bungee/src/main/java/codecrafter47/bungeetablistplus/version/BungeeProtocolVersionProvider.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,9 @@ public boolean has1193OrLater(ProxiedPlayer player) {
5454
return player.getPendingConnection().getVersion() >= 761;
5555
}
5656

57+
@Override
58+
public boolean has1214OrLater(ProxiedPlayer player) {
59+
return player.getPendingConnection().getVersion() >= 769;
60+
}
61+
5762
}

bungee/src/main/java/codecrafter47/bungeetablistplus/version/ProtocolSupportVersionProvider.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,16 @@ public boolean has1193OrLater(ProxiedPlayer player) {
7171
}
7272
}
7373

74+
@Override
75+
public boolean has1214OrLater(ProxiedPlayer player) {
76+
ProtocolVersion protocolVersion = ProtocolSupportAPI.getProtocolVersion(player);
77+
if (psb12) {
78+
return false;
79+
} else {
80+
return protocolVersion.getId() >= 769;
81+
}
82+
}
83+
7484
@Override
7585
public boolean is18(ProxiedPlayer player) {
7686
ProtocolVersion protocolVersion = ProtocolSupportAPI.getProtocolVersion(player);

bungee/src/main/java/codecrafter47/bungeetablistplus/version/ProtocolVersionProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@ public interface ProtocolVersionProvider {
3232
String getVersion(ProxiedPlayer player);
3333

3434
boolean has1193OrLater(ProxiedPlayer player);
35+
36+
boolean has1214OrLater(ProxiedPlayer player);
3537
}

bungee/src/main/java/codecrafter47/bungeetablistplus/version/ViaVersionProtocolVersionProvider.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ public boolean has1193OrLater(ProxiedPlayer player) {
4545
return Via.getAPI().getPlayerVersion(player) >= 761;
4646
}
4747

48+
@Override
49+
public boolean has1214OrLater(ProxiedPlayer player) {
50+
return Via.getAPI().getPlayerVersion(player) >= 769;
51+
}
52+
4853
@Override
4954
public boolean is18(ProxiedPlayer player) {
5055
return Via.getAPI().getPlayerVersion(player) == 47;

minecraft-data-api

0 commit comments

Comments
 (0)