Skip to content

Commit

Permalink
add a new tablist handler for 1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeCrafter47 committed Dec 29, 2024
1 parent ecbe3e5 commit 5d7d370
Show file tree
Hide file tree
Showing 9 changed files with 1,217 additions and 4 deletions.
2 changes: 1 addition & 1 deletion TabOverlayCommon
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {

ext {
spigotVersion = '1.11-R0.1-SNAPSHOT'
bungeeVersion = '1.20-R0.2-SNAPSHOT'
bungeeVersion = '1.21-R0.1-SNAPSHOT'
spongeVersion = '7.0.0'
dataApiVersion = '1.0.2-SNAPSHOT'
}
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,11 @@ private PlayerTabView createTabView(ProxiedPlayer player) {
Logger logger = new ChildLogger(btlp.getLogger(), player.getName());
EventLoop eventLoop = ReflectionUtil.getChannelWrapper(player).getHandle().eventLoop();

if (protocolVersionProvider.has1193OrLater(player)) {
if (protocolVersionProvider.has1214OrLater(player)) {
OrderedTabOverlayHandler handler = new OrderedTabOverlayHandler(logger, eventLoop, player);
tabOverlayHandler = handler;
packetHandler = new RewriteLogic(new GetGamemodeLogic(handler, (UserConnection) player));
} else if (protocolVersionProvider.has1193OrLater(player)) {
NewTabOverlayHandler handler = new NewTabOverlayHandler(logger, eventLoop, player);
tabOverlayHandler = handler;
packetHandler = new RewriteLogic(new GetGamemodeLogic(handler, (UserConnection) player));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,9 @@ public boolean has1193OrLater(ProxiedPlayer player) {
return player.getPendingConnection().getVersion() >= 761;
}

@Override
public boolean has1214OrLater(ProxiedPlayer player) {
return player.getPendingConnection().getVersion() >= 769;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,16 @@ public boolean has1193OrLater(ProxiedPlayer player) {
}
}

@Override
public boolean has1214OrLater(ProxiedPlayer player) {
ProtocolVersion protocolVersion = ProtocolSupportAPI.getProtocolVersion(player);
if (psb12) {
return false;
} else {
return protocolVersion.getId() >= 769;
}
}

@Override
public boolean is18(ProxiedPlayer player) {
ProtocolVersion protocolVersion = ProtocolSupportAPI.getProtocolVersion(player);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ public interface ProtocolVersionProvider {
String getVersion(ProxiedPlayer player);

boolean has1193OrLater(ProxiedPlayer player);

boolean has1214OrLater(ProxiedPlayer player);
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ public boolean has1193OrLater(ProxiedPlayer player) {
return Via.getAPI().getPlayerVersion(player) >= 761;
}

@Override
public boolean has1214OrLater(ProxiedPlayer player) {
return Via.getAPI().getPlayerVersion(player) >= 769;
}

@Override
public boolean is18(ProxiedPlayer player) {
return Via.getAPI().getPlayerVersion(player) == 47;
Expand Down
2 changes: 1 addition & 1 deletion minecraft-data-api

0 comments on commit 5d7d370

Please sign in to comment.