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

profiler remembers requestee, and better rounding in scarpet

Browse Source
This commit is contained in:
gnembon committed 2019-08-23 06:04:13 +02:00
1 parent a7addf7948
commit 8a01ebea41
7 files changed
+50 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/logging/HUDLogger.java
+4 -2
View File
@@ -1,7 +1,9 @@
package carpet.logging;
import carpet.utils.HUDController;
import net.minecraft.client.network.packet.TitleS2CPacket;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.BaseText;
public class HUDLogger extends Logger
@@ -14,13 +16,13 @@ public class HUDLogger extends Logger
@Override
public void removePlayer(String playerName)
{
PlayerEntity player = playerFromName(playerName);
ServerPlayerEntity player = playerFromName(playerName);
if (player != null) HUDController.clear_player(player);
super.removePlayer(playerName);
}
@Override
public void sendPlayerMessage(PlayerEntity player, BaseText... messages)
public void sendPlayerMessage(ServerPlayerEntity player, BaseText... messages)
{
for (BaseText m:messages) HUDController.addMessage(player, m);
}
src/main/java/carpet/logging/Logger.java
+6 -5
View File
@@ -2,6 +2,7 @@ package carpet.logging;
import carpet.CarpetServer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.BaseText;
import java.util.Arrays;
@@ -94,7 +95,7 @@ public class Logger
{
for (Map.Entry<String,String> en : subscribedOnlinePlayers.entrySet())
{
PlayerEntity player = playerFromName(en.getKey());
ServerPlayerEntity player = playerFromName(en.getKey());
if (player != null)
{
BaseText [] messages = messagePromise.get(en.getValue(),player);
@@ -115,7 +116,7 @@ public class Logger
Map<String, BaseText[]> cannedMessages = new HashMap<>();
for (Map.Entry<String,String> en : subscribedOnlinePlayers.entrySet())
{
PlayerEntity player = playerFromName(en.getKey());
ServerPlayerEntity player = playerFromName(en.getKey());
if (player != null)
{
String option = en.getValue();
@@ -137,7 +138,7 @@ public class Logger
BaseText [] cannedMessages = null;
for (Map.Entry<String,String> en : subscribedOnlinePlayers.entrySet())
{
PlayerEntity player = playerFromName(en.getKey());
ServerPlayerEntity player = playerFromName(en.getKey());
if (player != null)
{
if (cannedMessages == null) cannedMessages = messagePromise.get();
@@ -146,7 +147,7 @@ public class Logger
}
}
public void sendPlayerMessage(PlayerEntity player, BaseText ... messages)
public void sendPlayerMessage(ServerPlayerEntity player, BaseText ... messages)
{
Arrays.stream(messages).forEach(player::sendMessage);
}
@@ -154,7 +155,7 @@ public class Logger
/**
* Gets the {@code PlayerEntity} instance for a player given their UUID. Returns null if they are offline.
*/
protected PlayerEntity playerFromName(String name)
protected ServerPlayerEntity playerFromName(String name)
{
return CarpetServer.minecraft_server.getPlayerManager().getPlayer(name);
}