mulitple counters in hud - not really needed but why not.
This commit is contained in:
1 parent
54f81f184a
commit
b4a50b8c3f
3 files changed
+8
-8
No files matched your search
@@ -43,7 +43,7 @@ public class LogCommand
|
|||||||
c.getSource(),
|
c.getSource(),
|
||||||
c.getSource().getName(),
|
c.getSource().getName(),
|
||||||
getString(c, "log name")))).
|
getString(c, "log name")))).
|
||||||
then(CommandManager.argument("option", StringArgumentType.word()).
|
then(CommandManager.argument("option", StringArgumentType.greedyString()).
|
||||||
suggests( (c, b) -> suggestMatching(
|
suggests( (c, b) -> suggestMatching(
|
||||||
(LoggerRegistry.getLogger(getString(c, "log name"))==null
|
(LoggerRegistry.getLogger(getString(c, "log name"))==null
|
||||||
?new String[]{}
|
?new String[]{}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package carpet.settings;
|
|||||||
import carpet.CarpetServer;
|
import carpet.CarpetServer;
|
||||||
import carpet.utils.Messenger;
|
import carpet.utils.Messenger;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.collect.Sets;
|
|
||||||
import net.minecraft.server.command.ServerCommandSource;
|
import net.minecraft.server.command.ServerCommandSource;
|
||||||
|
|
||||||
import java.lang.reflect.Constructor;
|
import java.lang.reflect.Constructor;
|
||||||
|
|||||||
@@ -5,19 +5,17 @@ import carpet.helpers.TickSpeed;
|
|||||||
import carpet.logging.LoggerRegistry;
|
import carpet.logging.LoggerRegistry;
|
||||||
import carpet.logging.logHelpers.PacketCounter;
|
import carpet.logging.logHelpers.PacketCounter;
|
||||||
import carpet.mixins.PlayerListHeaderS2CPacketMixin;
|
import carpet.mixins.PlayerListHeaderS2CPacketMixin;
|
||||||
import net.minecraft.entity.EntityCategory;
|
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.client.network.packet.PlayerListHeaderS2CPacket;
|
import net.minecraft.client.network.packet.PlayerListHeaderS2CPacket;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraft.util.Pair;
|
|
||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.MathHelper;
|
||||||
import net.minecraft.text.BaseText;
|
import net.minecraft.text.BaseText;
|
||||||
import net.minecraft.text.LiteralText;
|
import net.minecraft.text.LiteralText;
|
||||||
import net.minecraft.world.dimension.DimensionType;
|
import net.minecraft.world.dimension.DimensionType;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
@@ -102,9 +100,12 @@ public class HUDController
|
|||||||
|
|
||||||
private static BaseText [] send_counter_info(MinecraftServer server, String color)
|
private static BaseText [] send_counter_info(MinecraftServer server, String color)
|
||||||
{
|
{
|
||||||
HopperCounter counter = HopperCounter.getCounter(color);
|
List <BaseText> res = new ArrayList<>();
|
||||||
List <BaseText> res = counter == null ? Collections.emptyList() : counter.format(server, false, true);
|
Arrays.asList(color.split(",")).forEach(c ->{
|
||||||
return new BaseText[]{ Messenger.c(res.toArray(new Object[0]))};
|
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()
|
private static BaseText [] packetCounter()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user