From 46762eedbb6cc7dfbc4019a1bca6aa66d0846772 Mon Sep 17 00:00:00 2001 From: DaMachinator Date: Fri, 19 Jan 2018 21:42:25 -0500 Subject: [PATCH] Rename and refactor several files Start work on network handler --- .../civilengineering/CivilEngineering.java | 19 +++++--------- .../arcanitor/civilengineering/Config.java | 4 ++- ...atMessage.java => ChatMessageHandler.java} | 2 +- ...andleDeath.java => DeathEventHandler.java} | 2 +- .../eventhandlers/FMLEventHandler.java | 26 +++++++++++++++++++ .../network/NetworkHandler.java | 13 ++++++++++ 6 files changed, 50 insertions(+), 16 deletions(-) rename src/main/java/arcanitor/civilengineering/eventhandlers/{HandleChatMessage.java => ChatMessageHandler.java} (93%) rename src/main/java/arcanitor/civilengineering/eventhandlers/{HandleDeath.java => DeathEventHandler.java} (96%) create mode 100644 src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java create mode 100644 src/main/java/arcanitor/civilengineering/network/NetworkHandler.java diff --git a/src/main/java/arcanitor/civilengineering/CivilEngineering.java b/src/main/java/arcanitor/civilengineering/CivilEngineering.java index b2241c1..fd1c5fa 100644 --- a/src/main/java/arcanitor/civilengineering/CivilEngineering.java +++ b/src/main/java/arcanitor/civilengineering/CivilEngineering.java @@ -1,14 +1,12 @@ package arcanitor.civilengineering; -import net.minecraftforge.common.config.Configuration; +import arcanitor.civilengineering.eventhandlers.FMLEventHandler; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import org.apache.logging.log4j.Logger; -import java.io.File; - @Mod( modid = CivilEngineering.MODID, name = CivilEngineering.NAME, @@ -26,17 +24,13 @@ public class CivilEngineering { public static CivilEngineering instance; public static Logger logger; - public static Configuration config; + @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { logger = event.getModLog(); - logger.info("Reading bridge blueprints..."); - - File directory = event.getModConfigurationDirectory(); - config = new Configuration(new File(directory.getPath(), "CivilEngineering.cfg")); - Config.readConfig(); + FMLEventHandler.preInit(event); } @Mod.EventHandler @@ -45,11 +39,10 @@ public class CivilEngineering { } @Mod.EventHandler - public void init(FMLPostInitializationEvent event) { + public void postInit(FMLPostInitializationEvent event) { logger.info("Bridge building post-init."); - if (config.hasChanged()) { - config.save(); - } + + FMLEventHandler.postInit(event); } } diff --git a/src/main/java/arcanitor/civilengineering/Config.java b/src/main/java/arcanitor/civilengineering/Config.java index cf5b79b..05280a5 100644 --- a/src/main/java/arcanitor/civilengineering/Config.java +++ b/src/main/java/arcanitor/civilengineering/Config.java @@ -1,5 +1,7 @@ package arcanitor.civilengineering; +import arcanitor.civilengineering.eventhandlers.FMLEventHandler; +import arcanitor.civilengineering.network.NetworkHandler; import net.minecraftforge.common.config.Configuration; import org.apache.logging.log4j.Level; @@ -13,7 +15,7 @@ public class Config { public static String connectURL = "localhost"; public static void readConfig() { - Configuration config = CivilEngineering.config; + Configuration config = FMLEventHandler.config; try { config.load(); initConfig(config); diff --git a/src/main/java/arcanitor/civilengineering/eventhandlers/HandleChatMessage.java b/src/main/java/arcanitor/civilengineering/eventhandlers/ChatMessageHandler.java similarity index 93% rename from src/main/java/arcanitor/civilengineering/eventhandlers/HandleChatMessage.java rename to src/main/java/arcanitor/civilengineering/eventhandlers/ChatMessageHandler.java index 5486442..8c906eb 100644 --- a/src/main/java/arcanitor/civilengineering/eventhandlers/HandleChatMessage.java +++ b/src/main/java/arcanitor/civilengineering/eventhandlers/ChatMessageHandler.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod.EventBusSubscriber -public class HandleChatMessage { +public class ChatMessageHandler { @SubscribeEvent public static void handleServerChatEvent (ServerChatEvent event) { CivilEngineering.logger.info("Message on server: "+event.getMessage()+" sent by "+event.getUsername()); diff --git a/src/main/java/arcanitor/civilengineering/eventhandlers/HandleDeath.java b/src/main/java/arcanitor/civilengineering/eventhandlers/DeathEventHandler.java similarity index 96% rename from src/main/java/arcanitor/civilengineering/eventhandlers/HandleDeath.java rename to src/main/java/arcanitor/civilengineering/eventhandlers/DeathEventHandler.java index 1e59d39..fc1b817 100644 --- a/src/main/java/arcanitor/civilengineering/eventhandlers/HandleDeath.java +++ b/src/main/java/arcanitor/civilengineering/eventhandlers/DeathEventHandler.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod.EventBusSubscriber -public class HandleDeath { +public class DeathEventHandler { @SubscribeEvent public static void handleLivingDeathEvent (LivingDeathEvent event) { if(Config.relayDeathEvents) { diff --git a/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java b/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java new file mode 100644 index 0000000..76a3eaf --- /dev/null +++ b/src/main/java/arcanitor/civilengineering/eventhandlers/FMLEventHandler.java @@ -0,0 +1,26 @@ +package arcanitor.civilengineering.eventhandlers; + + +import arcanitor.civilengineering.CivilEngineering; +import arcanitor.civilengineering.Config; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +import java.io.File; + +public class FMLEventHandler { + public static Configuration config; + + public static void preInit(FMLPreInitializationEvent event) { + CivilEngineering.logger.info("Reading bridge blueprints..."); + File directory = event.getModConfigurationDirectory(); + config = new Configuration(new File(directory.getPath(), "CivilEngineering.cfg")); + Config.readConfig(); + } + public static void postInit(FMLPostInitializationEvent event) { + if (config.hasChanged()) { + config.save(); + } + } +} diff --git a/src/main/java/arcanitor/civilengineering/network/NetworkHandler.java b/src/main/java/arcanitor/civilengineering/network/NetworkHandler.java new file mode 100644 index 0000000..49dbe16 --- /dev/null +++ b/src/main/java/arcanitor/civilengineering/network/NetworkHandler.java @@ -0,0 +1,13 @@ +package arcanitor.civilengineering.network; + +import arcanitor.civilengineering.CivilEngineering; + +public class NetworkHandler implements Runnable { + public void run() { + CivilEngineering.logger.info("Network Thread"); + } + + public static void Main(String[] args) { + (new Thread(new NetworkHandler())).start(); + } +}