From c5a72417d0e4df0587d36cbaa5c5fa070c1ffb4f Mon Sep 17 00:00:00 2001
From: DaMachinator <damachinator@gmail.com>
Date: Sat, 20 Jan 2018 16:47:20 -0500
Subject: [PATCH] Cleanup

---
 .../java/arcanitor/civilengineering/CivilEngineering.java | 5 +----
 .../civilengineering/bridge/OutgoingMessageHandler.java   | 2 +-
 .../arcanitor/civilengineering/command/BridgeCommand.java | 8 ++++----
 .../civilengineering/eventhandlers/FMLEventHandler.java   | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/arcanitor/civilengineering/CivilEngineering.java b/src/main/java/arcanitor/civilengineering/CivilEngineering.java
index e6300a7..8e45e75 100644
--- a/src/main/java/arcanitor/civilengineering/CivilEngineering.java
+++ b/src/main/java/arcanitor/civilengineering/CivilEngineering.java
@@ -25,8 +25,7 @@ public class CivilEngineering {
     public static CivilEngineering instance;
 
     public static Logger logger;
-    public static Thread incomingMessageThread = new Thread(new MessageHandler());
-    //public static Thread outgoingMessageThread = new Thread(new OutgoingMessageHandler());
+    public static Thread MessageNetworkThread = new Thread(new MessageHandler());
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
@@ -48,13 +47,11 @@ public class CivilEngineering {
 
     @Mod.EventHandler
     public void serverStarting(FMLServerStartingEvent event){
-        logger.info("Building chat bridge");
         FMLEventHandler.serverStarting(event);
     }
 
     @Mod.EventHandler
     public void serverStopping(FMLServerStoppingEvent event) {
-        logger.info("Demolishing chat bridge.");
         FMLEventHandler.serverStopping(event);
     }
 }
diff --git a/src/main/java/arcanitor/civilengineering/bridge/OutgoingMessageHandler.java b/src/main/java/arcanitor/civilengineering/bridge/OutgoingMessageHandler.java
index daf6294..953d7f3 100644
--- a/src/main/java/arcanitor/civilengineering/bridge/OutgoingMessageHandler.java
+++ b/src/main/java/arcanitor/civilengineering/bridge/OutgoingMessageHandler.java
@@ -33,7 +33,7 @@ public class OutgoingMessageHandler implements Runnable {
             if (e instanceof InterruptedException) {
                 CivilEngineering.logger.info("Sending connection closed.");
             } else if (e instanceof IOException) {
-                CivilEngineering.incomingMessageThread.interrupt();
+                CivilEngineering.MessageNetworkThread.interrupt();
                 CivilEngineering.logger.error("Error connecting to bridge server!");
                 CivilEngineering.logger.error(e.getMessage());
             }
diff --git a/src/main/java/arcanitor/civilengineering/command/BridgeCommand.java b/src/main/java/arcanitor/civilengineering/command/BridgeCommand.java
index 0f2365b..9889f85 100644
--- a/src/main/java/arcanitor/civilengineering/command/BridgeCommand.java
+++ b/src/main/java/arcanitor/civilengineering/command/BridgeCommand.java
@@ -42,12 +42,12 @@ public class BridgeCommand extends CommandBase {
         }
         String cmd = args[0];
         if (cmd.toLowerCase().equals("connect")) {
-            if(!CivilEngineering.incomingMessageThread.isAlive()) {
-                CivilEngineering.incomingMessageThread = new Thread(new MessageHandler());
-                CivilEngineering.incomingMessageThread.start();
+            if(!CivilEngineering.MessageNetworkThread.isAlive()) {
+                CivilEngineering.MessageNetworkThread = new Thread(new MessageHandler());
+                CivilEngineering.MessageNetworkThread.start();
             }
         } else if (cmd.toLowerCase().equals("disconnect")) {
-            CivilEngineering.incomingMessageThread.interrupt();
+            CivilEngineering.MessageNetworkThread.interrupt();
         }
     }
 
diff --git a/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java b/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java
index 57ccbfe..b572474 100644
--- a/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java
+++ b/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java
@@ -30,10 +30,10 @@ public class FMLEventHandler {
 
     public static void serverStarting(FMLServerStartingEvent event) {
         event.registerServerCommand(new BridgeCommand());
-        CivilEngineering.incomingMessageThread.start();
+        CivilEngineering.MessageNetworkThread.start();
     }
 
     public static void serverStopping(FMLServerStoppingEvent event) {
-        CivilEngineering.incomingMessageThread.interrupt();
+        CivilEngineering.MessageNetworkThread.interrupt();
     }
 }