loggers can now be configured to start with different default configurations.

This commit is contained in:
gnembon committed 2019-09-27 08:34:43 -05:00
1 parent 0e2ab5d4f3
commit 65d2208e9e
4 files changed
+50 -4

No files matched your search

+18 -1
View File
@@ -1,13 +1,16 @@
package carpet.logging;
import carpet.CarpetServer;
import carpet.settings.CarpetSettings;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.BaseText;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
public class Logger
@@ -85,6 +88,12 @@ public class Logger
return subscribedOnlinePlayers.size() > 0;
}
public void serverStopped()
{
subscribedOnlinePlayers.clear();
subscribedOfflinePlayers.clear();
}
/**
* serves messages to players fetching them from the promise
* will repeat invocation for players that share the same option
@@ -162,7 +171,7 @@ public class Logger
// ----- Event Handlers ----- //
public void onPlayerConnect(PlayerEntity player)
public void onPlayerConnect(PlayerEntity player, boolean firstTime)
{
// If the player was subscribed to the log and offline, move them to the set of online subscribers.
String playerName = player.getName().getString();
@@ -171,6 +180,14 @@ public class Logger
subscribedOnlinePlayers.put(playerName, subscribedOfflinePlayers.get(playerName));
subscribedOfflinePlayers.remove(playerName);
}
else if(firstTime)
{
Set<String> loggingOptions = new HashSet<>(Arrays.asList(CarpetSettings.defaultLoggers.split(",")));
if (loggingOptions.contains(getLogName()))
{
subscribedOnlinePlayers.put(playerName, getDefault());
}
}
LoggerRegistry.setAccess(this);
}
@@ -7,6 +7,7 @@ import net.minecraft.util.DyeColor;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -137,14 +138,31 @@ public class LoggerRegistry
setAccess(logger);
}
public static void playerConnected(PlayerEntity player)
private static Set<String> seenPlayers = new HashSet<>();
public static void stopLoggers()
{
seenPlayers.clear();
for(Logger log: loggerRegistry.values() )
{
log.onPlayerConnect(player);
log.serverStopped();
}
}
public static void playerConnected(PlayerEntity player)
{
boolean firstTime = false;
if (!seenPlayers.contains(player.getName().getString()))
{
seenPlayers.add(player.getName().getString());
firstTime = true;
//subscribe them to the defualt loggers
}
for(Logger log: loggerRegistry.values() )
{
log.onPlayerConnect(player, firstTime);
}
}
public static void playerDisconnected(PlayerEntity player)
{
for(Logger log: loggerRegistry.values() )