sorceress
/
MatterLink
mirror of https://github.com/AgathaSorceress/MatterLink.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup

This commit is contained in:
DaMachinator 2018-01-20 16:47:20 -05:00 committed by Arcanitor
parent bbfe4db3b1
commit c5a72417d0
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/arcanitor/civilengineering/CivilEngineering.java
View File

@ -25,8 +25,7 @@ public class CivilEngineering {
public static CivilEngineering instance; public static CivilEngineering instance;
public static Logger logger; public static Logger logger;
public static Thread incomingMessageThread = new Thread(new MessageHandler()); public static Thread MessageNetworkThread = new Thread(new MessageHandler());
//public static Thread outgoingMessageThread = new Thread(new OutgoingMessageHandler());
@Mod.EventHandler @Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) { public void preInit(FMLPreInitializationEvent event) {
@ -48,13 +47,11 @@ public class CivilEngineering {
@Mod.EventHandler @Mod.EventHandler
public void serverStarting(FMLServerStartingEvent event){ public void serverStarting(FMLServerStartingEvent event){
logger.info("Building chat bridge");
FMLEventHandler.serverStarting(event); FMLEventHandler.serverStarting(event);
} }
@Mod.EventHandler @Mod.EventHandler
public void serverStopping(FMLServerStoppingEvent event) { public void serverStopping(FMLServerStoppingEvent event) {
logger.info("Demolishing chat bridge.");
FMLEventHandler.serverStopping(event); FMLEventHandler.serverStopping(event);
} }
} }

2
src/main/java/arcanitor/civilengineering/bridge/OutgoingMessageHandler.java
View File

@ -33,7 +33,7 @@ public class OutgoingMessageHandler implements Runnable {
if (e instanceof InterruptedException) { if (e instanceof InterruptedException) {
CivilEngineering.logger.info("Sending connection closed."); CivilEngineering.logger.info("Sending connection closed.");
} else if (e instanceof IOException) { } else if (e instanceof IOException) {
CivilEngineering.incomingMessageThread.interrupt(); CivilEngineering.MessageNetworkThread.interrupt();
CivilEngineering.logger.error("Error connecting to bridge server!"); CivilEngineering.logger.error("Error connecting to bridge server!");
CivilEngineering.logger.error(e.getMessage()); CivilEngineering.logger.error(e.getMessage());
} }

8
src/main/java/arcanitor/civilengineering/command/BridgeCommand.java
View File

@ -42,12 +42,12 @@ public class BridgeCommand extends CommandBase {
} }
String cmd = args[0]; String cmd = args[0];
if (cmd.toLowerCase().equals("connect")) { if (cmd.toLowerCase().equals("connect")) {
if(!CivilEngineering.incomingMessageThread.isAlive()) { if(!CivilEngineering.MessageNetworkThread.isAlive()) {
CivilEngineering.incomingMessageThread = new Thread(new MessageHandler()); CivilEngineering.MessageNetworkThread = new Thread(new MessageHandler());
CivilEngineering.incomingMessageThread.start(); CivilEngineering.MessageNetworkThread.start();
} }
} else if (cmd.toLowerCase().equals("disconnect")) { } else if (cmd.toLowerCase().equals("disconnect")) {
CivilEngineering.incomingMessageThread.interrupt(); CivilEngineering.MessageNetworkThread.interrupt();
} }
} }

4
src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java
View File

@ -30,10 +30,10 @@ public class FMLEventHandler {
public static void serverStarting(FMLServerStartingEvent event) { public static void serverStarting(FMLServerStartingEvent event) {
event.registerServerCommand(new BridgeCommand()); event.registerServerCommand(new BridgeCommand());
CivilEngineering.incomingMessageThread.start(); CivilEngineering.MessageNetworkThread.start();
} }
public static void serverStopping(FMLServerStoppingEvent event) { public static void serverStopping(FMLServerStoppingEvent event) {
CivilEngineering.incomingMessageThread.interrupt(); CivilEngineering.MessageNetworkThread.interrupt();
} }
} }