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

--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -91,6 +91,7 @@
    public boolean func_71197_b() throws IOException {
       Thread thread = new Thread("Server console handler") {
          public void run() {
+            if (net.minecraftforge.server.console.TerminalHandler.handleCommands(DedicatedServer.this)) return;
             BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
 
             String s4;
@@ -112,6 +113,7 @@
          field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
       }
 
+      net.minecraftforge.fml.server.ServerModLoader.begin(this);
       field_155771_h.info("Loading properties");
       this.field_71340_o = new PropertyManager(new File("server.properties"));
       this.field_154332_n = new ServerEula(new File("eula.txt"));
@@ -183,6 +185,7 @@
          if (!PreYggdrasilConverter.func_152714_a(this.field_71340_o)) {
             return false;
          } else {
+            net.minecraftforge.fml.server.ServerModLoader.end();
             this.func_184105_a(new DedicatedPlayerList(this));
             long j = Util.func_211178_c();
             if (this.func_71270_I() == null) {
@@ -220,6 +223,7 @@
             TileEntitySkull.func_184293_a(this.func_152358_ax());
             TileEntitySkull.func_184294_a(this.func_147130_as());
             PlayerProfileCache.func_187320_a(this.func_71266_T());
+            if (!net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerAboutToStart(this)) return false;
             field_155771_h.info("Preparing level \"{}\"", (Object)this.func_71270_I());
             JsonObject jsonobject = new JsonObject();
             if (worldtype == WorldType.field_77138_c) {
@@ -232,6 +236,7 @@
             long i1 = Util.func_211178_c() - j;
             String s3 = String.format(Locale.ROOT, "%.3fs", (double)i1 / 1.0E9D);
             field_155771_h.info("Done ({})! For help, type \"help\"", (Object)s3);
+            this.field_211151_aa = Util.func_211177_b(); //Forge: Update server time to prevent watchdog/spaming during long load.
             if (this.field_71340_o.func_187239_a("announce-player-achievements")) {
                this.func_200252_aR().func_82764_b("announceAdvancements", this.field_71340_o.func_73670_a("announce-player-achievements", true) ? "true" : "false", this);
                this.field_71340_o.func_187238_b("announce-player-achievements");
@@ -259,7 +264,8 @@
             }
 
             Items.field_190931_a.func_150895_a(ItemGroup.field_78027_g, NonNullList.func_191196_a());
-            return true;
+            // <3 you Grum for this, saves us ~30 patch files! --^
+            return net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerStarting(this);
          }
       }
    }
@@ -568,4 +574,9 @@
       this.func_195571_aL().func_197059_a(this.field_184115_n.func_195540_f(), p_71252_1_);
       return this.field_184115_n.func_70008_c();
    }
+
+   @Override //Forge: Enable formated text for colors in console.
+   public void func_145747_a(net.minecraft.util.text.ITextComponent message) {
+      field_155771_h.info(message.func_150254_d());
+   }
 }