Merge branch 'master' of https://github.com/gnembon/carpetmod

.gitignore

@@ -3,3 +3,5 @@
 .project
 /build/
 /ForgeGradle/
+/.idea/
+/out/

patches/net/minecraft/client/Minecraft.java.patch

@@ -0,0 +1,21 @@
+--- a/net/minecraft/client/Minecraft.java
++++ b/net/minecraft/client/Minecraft.java
+@@ -195,6 +195,8 @@
+ import org.lwjgl.glfw.GLFW;
+ import org.lwjgl.glfw.GLFWErrorCallback;
+
++import carpet.CarpetServer;
++
+ @OnlyIn(Dist.CLIENT)
+ public class Minecraft implements IThreadListener, ISnooperInfo, IGuiEventListenerDeferred
+ {
+@@ -516,6 +518,9 @@
+         this.mainWindow.updateVsyncFromGameSettings();
+         this.mainWindow.setLogOnGlError();
+         this.renderGlobal.makeEntityOutlineShader();
++
++        //CM start game hook
++        CarpetServer.onGameStarted();
+     }
+
+     private void checkForGLFWInitError()

patches/net/minecraft/client/gui/GuiIngame.java.patch

@@ -0,0 +1,12 @@
+--- a/net/minecraft/client/gui/GuiIngame.java
++++ b/net/minecraft/client/gui/GuiIngame.java
+@@ -353,7 +353,8 @@
+             GlStateManager.popMatrix();
+             scoreobjective1 = scoreboard.getObjectiveInDisplaySlot(0);
+
+-            if (!this.mc.gameSettings.keyBindPlayerList.isKeyDown() || this.mc.isIntegratedServerRunning() && this.mc.player.connection.getPlayerInfoMap().size() <= 1 && scoreobjective1 == null)
++            //CM display player list if footer or header exists to make logs visible in singleplayer
++            if (!this.mc.gameSettings.keyBindPlayerList.isKeyDown() || this.mc.isIntegratedServerRunning() && this.mc.player.connection.getPlayerInfoMap().size() <= 1 && scoreobjective1 == null && !overlayPlayerList.hasFooterOrHeader())
+             {
+                 this.overlayPlayerList.setVisible(false);
+             }

patches/net/minecraft/client/gui/GuiPlayerTabOverlay.java.patch

@@ -0,0 +1,15 @@
+--- a/net/minecraft/client/gui/GuiPlayerTabOverlay.java
++++ b/net/minecraft/client/gui/GuiPlayerTabOverlay.java
+@@ -375,6 +375,12 @@
+         this.footer = null;
+     }
+
++    //CM accessor
++    public boolean hasFooterOrHeader()
++    {
++        return footer != null || header != null;
++    }
++
+     @OnlyIn(Dist.CLIENT)
+     static class PlayerComparator implements Comparator<NetworkPlayerInfo>
+         {

patches/net/minecraft/command/Commands.java.patch

@@ -17,3 +17,14 @@
 
          this.dispatcher.findAmbiguities((p_201302_1_, p_201302_2_, p_201302_3_, p_201302_4_) ->
          {
+@@ -259,6 +262,10 @@
+                         itextcomponent.appendText("\n\n").appendText(astacktraceelement[j].getMethodName()).appendText("\n ").appendText(astacktraceelement[j].getFileName()).appendText(":").appendText(String.valueOf(astacktraceelement[j].getLineNumber()));
+                     }
+                 }
++                else //CM print errors in production too
++                {
++                    exception.printStackTrace();
++                }
+
+                 p_197059_1_.sendErrorMessage((new TextComponentTranslation("command.failed", new Object[0])).applyTextStyle((p_211704_1_) ->
+                 {

patches/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -7,13 +7,15 @@
  import com.google.common.collect.Lists;
  import com.google.gson.JsonObject;
  import com.mojang.authlib.GameProfileRepository;
-@@ -268,6 +269,10 @@
+@@ -268,6 +269,12 @@
                  TileEntitySkull.setProfileCache(this.getPlayerProfileCache());
                  TileEntitySkull.setSessionService(this.getMinecraftSessionService());
                  PlayerProfileCache.setOnlineMode(this.isServerInOnlineMode());
 +
 +                //CM init - all stuff loaded from the server, just before worlds loading
 +                CarpetServer.onServerLoaded(this);
++                //CM start game hook
++                CarpetServer.onGameStarted();
 +
                  LOGGER.info("Preparing level \"{}\"", (Object)this.getFolderName());
                  JsonObject jsonobject = new JsonObject();

patches/net/minecraft/server/integrated/IntegratedServer.java.patch

@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/integrated/IntegratedServer.java
++++ b/net/minecraft/server/integrated/IntegratedServer.java
+@@ -38,6 +38,8 @@
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+
++import carpet.CarpetServer;
++
+ @OnlyIn(Dist.CLIENT)
+ public class IntegratedServer extends MinecraftServer
+ {
+@@ -101,6 +103,8 @@
+         this.setAllowFlight(true);
+         LOGGER.info("Generating keypair");
+         this.setKeyPair(CryptManager.generateKeyPair());
++        //CM init - all stuff loaded from the server, just before worlds loading
++        CarpetServer.onServerLoaded(this);
+         this.loadAllWorlds(this.getFolderName(), this.getWorldName(), this.worldSettings.getSeed(), this.worldSettings.getTerrainType(), this.worldSettings.getGeneratorOptions());
+         this.setMOTD(this.getServerOwner() + " - " + this.getWorld(DimensionType.OVERWORLD).getWorldInfo().getWorldName());
+         return true;

src/main/java/carpet/CarpetServer.java

@@ -44,7 +44,10 @@ public static void onServerLoaded(MinecraftServer server)
     {
         CarpetSettings.apply_settings_from_conf(server);
         //CarpetSettings.reload_all_statics(); // not needed anymore due to validators
-        LoggerRegistry.initLoggers(server);
+    }
+    // Separate from onServerLoaded, because a server can be loaded multiple times in singleplayer
+    public static void onGameStarted() {
+        LoggerRegistry.initLoggers();
     }
     /*public static void onLoadAllWorlds(MinecraftServer server)
     {

src/main/java/carpet/logging/HUDLogger.java

@@ -7,9 +7,9 @@
 
 public class HUDLogger extends Logger
 {
-    public HUDLogger(MinecraftServer server, String logName, String def, String[] options)
+    public HUDLogger(String logName, String def, String[] options)
     {
-        super(server, logName, def, options);
+        super(logName, def, options);
     }
 
     @Override

src/main/java/carpet/logging/Logger.java

@@ -1,5 +1,6 @@
 package carpet.logging;
 
+import carpet.CarpetServer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.text.ITextComponent;
@@ -11,9 +12,6 @@
 
 public class Logger
 {
-    // Reference to the minecraft server. Used to look players up by name.
-    private MinecraftServer server;
-
     // The set of subscribed and online players.
     private Map<String, String> subscribedOnlinePlayers;
 
@@ -27,9 +25,8 @@ public class Logger
 
     private String[] options;
 
-    public Logger(MinecraftServer server, String logName, String def, String [] options)
+    public Logger(String logName, String def, String [] options)
     {
-        this.server = server;
         subscribedOnlinePlayers = new HashMap<>();
         subscribedOfflinePlayers = new HashMap<>();
         this.logName = logName;
@@ -160,7 +157,7 @@ public void sendPlayerMessage(EntityPlayer player, ITextComponent ... messages)
      */
     protected EntityPlayer playerFromName(String name)
     {
-        return server.getPlayerList().getPlayerByUsername(name);
+        return CarpetServer.minecraft_server.getPlayerList().getPlayerByUsername(name);
     }
 
     // ----- Event Handlers ----- //

src/main/java/carpet/logging/LoggerRegistry.java

@@ -29,19 +29,19 @@ public class LoggerRegistry
     public static boolean __packets;
     public static boolean __weather;
 
-    public static void initLoggers(MinecraftServer server)
+    public static void initLoggers()
     {
-        registerLogger("tnt", new Logger(server, "tnt", "brief", new String[]{"brief", "full"}));
-        registerLogger("projectiles", new Logger(server, "projectiles", "brief",  new String[]{"brief", "full"}));
-        registerLogger("fallingBlocks",new Logger(server, "fallingBlocks", "brief", new String[]{"brief", "full"}));
-        registerLogger("kills", new Logger(server, "kills", null, null));
-        registerLogger("damage", new Logger(server, "damage", "all", new String[]{"all","players","me"}));
-        registerLogger("weather", new Logger(server, "weather", null, null));
-
-        registerLogger("tps", new HUDLogger(server, "tps", null, null));
-        registerLogger("packets", new HUDLogger(server, "packets", null, null));
-        registerLogger("counter",new HUDLogger(server, "counter","white", Arrays.stream(EnumDyeColor.values()).map(Object::toString).toArray(String[]::new)));
-        registerLogger("mobcaps", new HUDLogger(server, "mobcaps", "dynamic",new String[]{"dynamic", "overworld", "nether","end"}));
+        registerLogger("tnt", new Logger("tnt", "brief", new String[]{"brief", "full"}));
+        registerLogger("projectiles", new Logger("projectiles", "brief",  new String[]{"brief", "full"}));
+        registerLogger("fallingBlocks",new Logger("fallingBlocks", "brief", new String[]{"brief", "full"}));
+        registerLogger("kills", new Logger("kills", null, null));
+        registerLogger("damage", new Logger("damage", "all", new String[]{"all","players","me"}));
+        registerLogger("weather", new Logger("weather", null, null));
+
+        registerLogger("tps", new HUDLogger("tps", null, null));
+        registerLogger("packets", new HUDLogger("packets", null, null));
+        registerLogger("counter",new HUDLogger("counter","white", Arrays.stream(EnumDyeColor.values()).map(Object::toString).toArray(String[]::new)));
+        registerLogger("mobcaps", new HUDLogger("mobcaps", "dynamic",new String[]{"dynamic", "overworld", "nether","end"}));
     }
 
     /**