diff --git a/src/main/java/carpet/commands/LogCommand.java b/src/main/java/carpet/commands/LogCommand.java index 5570b5f7..751acc26 100644 --- a/src/main/java/carpet/commands/LogCommand.java +++ b/src/main/java/carpet/commands/LogCommand.java @@ -43,7 +43,7 @@ public class LogCommand c.getSource(), c.getSource().getName(), getString(c, "log name")))). - then(CommandManager.argument("option", StringArgumentType.word()). + then(CommandManager.argument("option", StringArgumentType.greedyString()). suggests( (c, b) -> suggestMatching( (LoggerRegistry.getLogger(getString(c, "log name"))==null ?new String[]{} diff --git a/src/main/java/carpet/settings/ParsedRule.java b/src/main/java/carpet/settings/ParsedRule.java index dd9874b8..2b7289cf 100644 --- a/src/main/java/carpet/settings/ParsedRule.java +++ b/src/main/java/carpet/settings/ParsedRule.java @@ -3,7 +3,6 @@ package carpet.settings; import carpet.CarpetServer; import carpet.utils.Messenger; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; import net.minecraft.server.command.ServerCommandSource; import java.lang.reflect.Constructor; diff --git a/src/main/java/carpet/utils/HUDController.java b/src/main/java/carpet/utils/HUDController.java index 9458efed..e04c718c 100644 --- a/src/main/java/carpet/utils/HUDController.java +++ b/src/main/java/carpet/utils/HUDController.java @@ -5,19 +5,17 @@ import carpet.helpers.TickSpeed; import carpet.logging.LoggerRegistry; import carpet.logging.logHelpers.PacketCounter; import carpet.mixins.PlayerListHeaderS2CPacketMixin; -import net.minecraft.entity.EntityCategory; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.client.network.packet.PlayerListHeaderS2CPacket; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.Pair; import net.minecraft.util.math.MathHelper; import net.minecraft.text.BaseText; import net.minecraft.text.LiteralText; import net.minecraft.world.dimension.DimensionType; import java.util.ArrayList; -import java.util.Collections; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -102,9 +100,12 @@ public class HUDController private static BaseText [] send_counter_info(MinecraftServer server, String color) { - HopperCounter counter = HopperCounter.getCounter(color); - List res = counter == null ? Collections.emptyList() : counter.format(server, false, true); - return new BaseText[]{ Messenger.c(res.toArray(new Object[0]))}; + List 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 BaseText[0]); } private static BaseText [] packetCounter() {