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

22w16b with massive Component changes

Browse Source
This commit is contained in:
gnembon committed 2022-04-21 00:26:39 +02:00
1 parent 8101abb431
commit 746c8548e9
31 files changed
+153 -162
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/logging/HUDController.java
+17 -18
View File
@@ -8,8 +8,7 @@ import carpet.utils.Messenger;
import carpet.utils.SpawnReporter;
import io.netty.buffer.Unpooled;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ClientboundTabListPacket;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MinecraftServer;
@@ -41,18 +40,18 @@ public class HUDController
HUDListeners.add(listener);
}
public static Map<ServerPlayer, List<BaseComponent>> player_huds = new HashMap<>();
public static Map<ServerPlayer, List<Component>> player_huds = new HashMap<>();
//keyed with player names so unlogged players don't hold the reference
public static final Map<String, BaseComponent> scarpet_headers = new HashMap<>();
public static final Map<String, Component> scarpet_headers = new HashMap<>();
public static final Map<String, BaseComponent> scarpet_footers = new HashMap<>();
public static final Map<String, Component> scarpet_footers = new HashMap<>();
public static void resetScarpetHUDs() {
scarpet_headers.clear();
scarpet_footers.clear();
}
public static void addMessage(ServerPlayer player, BaseComponent hudMessage)
public static void addMessage(ServerPlayer player, Component hudMessage)
{
if (player == null) return;
if (!player_huds.containsKey(player))
@@ -61,13 +60,13 @@ public class HUDController
}
else
{
player_huds.get(player).add(new TextComponent("\n"));
player_huds.get(player).add(Component.literal("\n"));
}
player_huds.get(player).add(hudMessage);
}
public static void clear_player(Player player)
{
FriendlyByteBuf packetData = new FriendlyByteBuf(Unpooled.buffer()).writeComponent(new TextComponent("")).writeComponent(new TextComponent(""));
FriendlyByteBuf packetData = new FriendlyByteBuf(Unpooled.buffer()).writeComponent(Component.literal("")).writeComponent(Component.literal(""));
ClientboundTabListPacket packet = new ClientboundTabListPacket(packetData);
//((PlayerListHeaderS2CPacketMixin)packet).setHeader(new LiteralText(""));
//((PlayerListHeaderS2CPacketMixin)packet).setFooter(new LiteralText(""));
@@ -83,7 +82,7 @@ public class HUDController
player_huds.clear();
server.getPlayerList().getPlayers().forEach(p -> {
BaseComponent scarpetFOoter = scarpet_footers.get(p.getScoreboardName());
Component scarpetFOoter = scarpet_footers.get(p.getScoreboardName());
if (scarpetFOoter != null) HUDController.addMessage(p, scarpetFOoter);
});
@@ -105,7 +104,7 @@ public class HUDController
dim = Level.END; // end
break;
}
return new BaseComponent[]{SpawnReporter.printMobcapsForDimension(server.getLevel(dim), false).get(0)};
return new Component[]{SpawnReporter.printMobcapsForDimension(server.getLevel(dim), false).get(0)};
});
if(LoggerRegistry.__counter)
@@ -122,7 +121,7 @@ public class HUDController
for (ServerPlayer player: targets)
{
FriendlyByteBuf packetData = new FriendlyByteBuf(Unpooled.buffer()).
writeComponent(scarpet_headers.getOrDefault(player.getScoreboardName(), new TextComponent(""))).
writeComponent(scarpet_headers.getOrDefault(player.getScoreboardName(), Component.literal(""))).
writeComponent(Messenger.c(player_huds.getOrDefault(player, Collections.emptyList()).toArray(new Object[0])));
ClientboundTabListPacket packet = new ClientboundTabListPacket(packetData);
@@ -132,28 +131,28 @@ public class HUDController
player.connection.send(packet);
}
}
private static BaseComponent [] send_tps_display(MinecraftServer server)
private static Component [] send_tps_display(MinecraftServer server)
{
double MSPT = Mth.average(server.tickTimes) * 1.0E-6D;
double TPS = 1000.0D / Math.max((TickSpeed.time_warp_start_time != 0)?0.0:TickSpeed.mspt, MSPT);
String color = Messenger.heatmap_color(MSPT,TickSpeed.mspt);
return new BaseComponent[]{Messenger.c(
return new Component[]{Messenger.c(
"g TPS: ", String.format(Locale.US, "%s %.1f",color, TPS),
"g MSPT: ", String.format(Locale.US,"%s %.1f", color, MSPT))};
}
private static BaseComponent [] send_counter_info(MinecraftServer server, String color)
private static Component [] send_counter_info(MinecraftServer server, String color)
{
List <BaseComponent> res = new ArrayList<>();
List <Component> res = new ArrayList<>();
Arrays.asList(color.split(",")).forEach(c ->{
HopperCounter counter = HopperCounter.getCounter(c);
if (counter != null) res.addAll(counter.format(server, false, true));
});
return res.toArray(new BaseComponent[0]);
return res.toArray(new Component[0]);
}
private static BaseComponent [] packetCounter()
private static Component [] packetCounter()
{
BaseComponent [] ret = new BaseComponent[]{
Component [] ret = new Component[]{
Messenger.c("w I/" + PacketCounter.totalIn + " O/" + PacketCounter.totalOut),
};
PacketCounter.reset();
src/main/java/carpet/logging/HUDLogger.java
+4 -3
View File
@@ -1,7 +1,8 @@
package carpet.logging;
import java.lang.reflect.Field;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
public class HUDLogger extends Logger
@@ -43,9 +44,9 @@ public class HUDLogger extends Logger
}
@Override
public void sendPlayerMessage(ServerPlayer player, BaseComponent... messages)
public void sendPlayerMessage(ServerPlayer player, Component... messages)
{
for (BaseComponent m:messages) HUDController.addMessage(player, m);
for (Component m:messages) HUDController.addMessage(player, m);
}
src/main/java/carpet/logging/Logger.java
+9 -9
View File
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
import net.minecraft.Util;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
@@ -135,7 +135,7 @@ public class Logger
* will repeat invocation for players that share the same option
*/
@FunctionalInterface
public interface lMessage { BaseComponent [] get(String playerOption, Player player);}
public interface lMessage { Component [] get(String playerOption, Player player);}
public void log(lMessage messagePromise)
{
for (Map.Entry<String,String> en : subscribedOnlinePlayers.entrySet())
@@ -143,7 +143,7 @@ public class Logger
ServerPlayer player = playerFromName(en.getKey());
if (player != null)
{
BaseComponent [] messages = messagePromise.get(en.getValue(),player);
Component [] messages = messagePromise.get(en.getValue(),player);
if (messages != null)
sendPlayerMessage(player, messages);
}
@@ -155,10 +155,10 @@ public class Logger
* and served the same way to all other players subscribed to the same option
*/
@FunctionalInterface
public interface lMessageIgnorePlayer { BaseComponent [] get(String playerOption);}
public interface lMessageIgnorePlayer { Component [] get(String playerOption);}
public void log(lMessageIgnorePlayer messagePromise)
{
Map<String, BaseComponent[]> cannedMessages = new HashMap<>();
Map<String, Component[]> cannedMessages = new HashMap<>();
for (Map.Entry<String,String> en : subscribedOnlinePlayers.entrySet())
{
ServerPlayer player = playerFromName(en.getKey());
@@ -169,7 +169,7 @@ public class Logger
{
cannedMessages.put(option,messagePromise.get(option));
}
BaseComponent [] messages = cannedMessages.get(option);
Component [] messages = cannedMessages.get(option);
if (messages != null)
sendPlayerMessage(player, messages);
}
@@ -178,9 +178,9 @@ public class Logger
/**
* guarantees that message is evaluated once, so independent from the player and chosen option
*/
public void log(Supplier<BaseComponent[]> messagePromise)
public void log(Supplier<Component[]> messagePromise)
{
BaseComponent [] cannedMessages = null;
Component [] cannedMessages = null;
for (Map.Entry<String,String> en : subscribedOnlinePlayers.entrySet())
{
ServerPlayer player = playerFromName(en.getKey());
@@ -192,7 +192,7 @@ public class Logger
}
}
public void sendPlayerMessage(ServerPlayer player, BaseComponent ... messages)
public void sendPlayerMessage(ServerPlayer player, Component ... messages)
{
Arrays.stream(messages).forEach(message -> player.sendMessage(message, Util.NIL_UUID));
}
src/main/java/carpet/logging/logHelpers/ExplosionLogHelper.java
+3 -3
View File
@@ -7,7 +7,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.core.Registry;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.Explosion;
@@ -52,7 +52,7 @@ public class ExplosionLogHelper
}
explosionCountInCurretGT++;
LoggerRegistry.getLogger("explosions").log( (option) -> {
List<BaseComponent> messages = new ArrayList<>();
List<Component> messages = new ArrayList<>();
if(newTick) messages.add(c("wb tick : ", "d " + gametime));
if ("brief".equals(option))
{
@@ -83,7 +83,7 @@ public class ExplosionLogHelper
});
}
}
return messages.toArray(new BaseComponent[0]);
return messages.toArray(new Component[0]);
});
}
src/main/java/carpet/logging/logHelpers/TNTLogHelper.java
+3 -3
View File
@@ -2,7 +2,7 @@ package carpet.logging.logHelpers;
import carpet.logging.LoggerRegistry;
import carpet.utils.Messenger;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.world.phys.Vec3;
public class TNTLogHelper
@@ -37,12 +37,12 @@ public class TNTLogHelper
switch (option)
{
case "brief":
return new BaseComponent[]{Messenger.c(
return new Component[]{Messenger.c(
"l P ",Messenger.dblt("l",primedX,primedY,primedZ),
"w ",Messenger.dblt("l", primedAngle.x, primedAngle.y, primedAngle.z),
"r E ",Messenger.dblt("r",x, y, z))};
case "full":
return new BaseComponent[]{Messenger.c(
return new Component[]{Messenger.c(
"r #" + tntCount,
"m @" + gametime,
"g : ",
src/main/java/carpet/logging/logHelpers/TrajectoryLogHelper.java
+4 -3
View File
@@ -5,7 +5,8 @@ import carpet.logging.LoggerRegistry;
import carpet.utils.Messenger;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.world.phys.Vec3;
/**
@@ -38,7 +39,7 @@ public class TrajectoryLogHelper
{
if (!doLog) return;
logger.log( (option) -> {
List<BaseComponent> comp = new ArrayList<>();
List<Component> comp = new ArrayList<>();
switch (option)
{
case "brief":
@@ -71,7 +72,7 @@ public class TrajectoryLogHelper
}
break;
}
return comp.toArray(new BaseComponent[0]);
return comp.toArray(new Component[0]);
});
doLog = false;
}