icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source 
# Conflicts:
#	src/main/java/carpet/logging/HUDController.java
This commit is contained in:
gnembon committed 2021-06-25 22:45:49 -03:00
2 parents ac24a67c00 096e62b865
commit 3073bcfe4b
3 files changed
+15 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/logging/HUDController.java
+9 -5
View File
@@ -44,10 +44,10 @@ public class HUDController
}
public static Map<ServerPlayerEntity, List<BaseText>> player_huds = new HashMap<>();
//keyed with player names so unlogged players don't hold the reference
public static final Map<String, BaseText> scarpet_headers = new HashMap<>();
public static final Map<ServerPlayerEntity, BaseText> scarpet_headers = new HashMap<>();
public static final Map<ServerPlayerEntity, BaseText> scarpet_footers = new HashMap<>();
public static final Map<String, BaseText> scarpet_footers = new HashMap<>();
public static void resetScarpetHUDs() {
scarpet_headers.clear();
@@ -56,6 +56,7 @@ public class HUDController
public static void addMessage(ServerPlayerEntity player, BaseText hudMessage)
{
if (player == null) return;
if (!player_huds.containsKey(player))
{
player_huds.put(player, new ArrayList<>());
@@ -83,7 +84,10 @@ public class HUDController
player_huds.clear();
scarpet_footers.forEach(HUDController::addMessage);
server.getPlayerManager().getPlayerList().forEach(p -> {
BaseText scarpetFOoter = scarpet_footers.get(p.getEntityName());
if (scarpetFOoter != null) HUDController.addMessage(p, scarpetFOoter);
});
if (LoggerRegistry.__tps)
LoggerRegistry.getLogger("tps").log(()-> send_tps_display(server));
@@ -125,7 +129,7 @@ public class HUDController
PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket(packetData);
//PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket();
//((PlayerListHeaderS2CPacketMixin)packet).setHeader(scarpet_headers.getOrDefault(player, new LiteralText("")));
//((PlayerListHeaderS2CPacketMixin)packet).setHeader(scarpet_headers.getOrDefault(player.getEntityName(), new LiteralText("")));
//((PlayerListHeaderS2CPacketMixin)packet).setFooter(Messenger.c(player_huds.getOrDefault(player, Collections.emptyList()).toArray(new Object[0])));
player.networkHandler.sendPacket(packet);
}