Merge pull request #7 from KwemberDev/master

added singleplayer config option for customization.

Author: KwemberDev

gradle.properties

@@ -1,6 +1,6 @@
 mod_id=simplenightmares
 mod_name=SimpleNightmares
-mod_version=1.1.12
+mod_version=1.1.13
 mod_author=["Kwember"]
 mod_description=A mod that adds various sleep events to the game, including nightmares, vicious ambushes and the ability to set a sleep percentage/player amount to skip the night even if not all players are sleeping.
 mod_credits=[Star Artsy for the Lamp models!]

src/main/java/SimpleNightmares/SimpleNightmares.java

@@ -20,7 +20,7 @@ public class SimpleNightmares {
     // create the mod info data
     public static final String MODID = "simplenightmares";
     public static final String MODNAME = "SimpleNightmares";
-    public static final String MODVERSION= "Beta 1.1.12";
+    public static final String MODVERSION= "Beta 1.1.13";
 
     //tells forge where to look for the server and client side proxies
     @SidedProxy(clientSide = "SimpleNightmares.proxy.ClientProxy", serverSide = "SimpleNightmares.proxy.ServerProxy")

src/main/java/SimpleNightmares/commands/SleepPercentageCommand.java

@@ -95,12 +95,25 @@ public void onPlayerSleep(MinecraftServer server, String playername) {
             }
 
             if (enableChatFeedback) {
-                if (sleepPlayers != -1) {
-                    ITextComponent message = new TextComponentString(TextFormatting.getValueByName(sleepMessageColor.toUpperCase()) + playername + " is now sleeping (" + sleepingPlayers + "/" + onlinePlayers + ")" + " (" + togo + ")" + TextFormatting.RESET);
-                    server.getPlayerList().getPlayers().forEach(player -> player.sendMessage(message));
-                } else {
-                    ITextComponent message = new TextComponentString(TextFormatting.getValueByName(sleepMessageColor.toUpperCase()) + playername + " is now sleeping (" + sleepingPlayers + "/" + onlinePlayers + ")" + " (" + percentage + "%)" + TextFormatting.RESET);
-                    server.getPlayerList().getPlayers().forEach(player-> player.sendMessage(message));
+
+                if (onlinePlayers < 2 && enableSinglePlayerChatFeedback) {
+                    if (sleepPlayers != -1) {
+                        ITextComponent message = new TextComponentString(TextFormatting.getValueByName(sleepMessageColor.toUpperCase()) + playername + " is now sleeping (" + sleepingPlayers + "/" + onlinePlayers + ")" + " (" + togo + ")" + TextFormatting.RESET);
+                        server.getPlayerList().getPlayers().forEach(player -> player.sendMessage(message));
+                    } else {
+                        ITextComponent message = new TextComponentString(TextFormatting.getValueByName(sleepMessageColor.toUpperCase()) + playername + " is now sleeping (" + sleepingPlayers + "/" + onlinePlayers + ")" + " (" + percentage + "%)" + TextFormatting.RESET);
+                        server.getPlayerList().getPlayers().forEach(player -> player.sendMessage(message));
+                    }
+                }
+
+                if (onlinePlayers >= 2) {
+                    if (sleepPlayers != -1) {
+                        ITextComponent message = new TextComponentString(TextFormatting.getValueByName(sleepMessageColor.toUpperCase()) + playername + " is now sleeping (" + sleepingPlayers + "/" + onlinePlayers + ")" + " (" + togo + ")" + TextFormatting.RESET);
+                        server.getPlayerList().getPlayers().forEach(player -> player.sendMessage(message));
+                    } else {
+                        ITextComponent message = new TextComponentString(TextFormatting.getValueByName(sleepMessageColor.toUpperCase()) + playername + " is now sleeping (" + sleepingPlayers + "/" + onlinePlayers + ")" + " (" + percentage + "%)" + TextFormatting.RESET);
+                        server.getPlayerList().getPlayers().forEach(player -> player.sendMessage(message));
+                    }
                 }
             }
             if (enableChatRemarks) {

src/main/java/SimpleNightmares/config/Config.java

@@ -24,6 +24,7 @@ public class Config {
     public static boolean enableChatRemarks = true;
     public static List<String> chatFeedback = new ArrayList<>();
     public static boolean enableChatFeedback = true;
+    public static boolean enableSinglePlayerChatFeedback = true;
     public static int sleepPercentage = 100;
     public static int sleepPlayers = -1;
     public static String sleepMessageColor = "GOLD";
@@ -105,6 +106,9 @@ private static void initSleepConfig(Configuration cfg) {
         enableChatFeedback = cfg.getBoolean("enableChatFeedback", CATEGORY_SLEEP, true, "Enable or Disable the 'player is sleeping' feedback in chat");
         enableChatRemarks = cfg.getBoolean("enableChatRemarks", CATEGORY_SLEEP, true, "Enable or Disable the dream feedback in chat when sleeping in multiplayer.");
 
+        enableSinglePlayerChatFeedback = cfg.getBoolean("enableSinglePlayerChatFeedback", CATEGORY_SLEEP, true, "Helper config option. If singlePlayerDebug is enabled but this option is disabled, 'player is sleeping' feedback will not occur when 1 player is in the world.");
+
+
         sleepMessageColor = cfg.getString("sleepMessageColor", CATEGORY_SLEEP, "GOLD", "Set the color for the 'is now sleeping' message. Color name must match TextFormatting enums.");
         wakeUpMessageColor = cfg.getString("wakeUpMessageColor", CATEGORY_SLEEP, "GOLD", "Set the color for the wake up chat remarks. Color name must match TextFormatting enums.");