Rename and refactor several files

Start work on network handler
This commit is contained in:
DaMachinator 2018-01-19 21:42:25 -05:00 committed by Arcanitor
parent 3a753887c6
commit 46762eedbb
6 changed files with 50 additions and 16 deletions

View File

@ -1,14 +1,12 @@
package arcanitor.civilengineering; 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.Mod;
import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import java.io.File;
@Mod( @Mod(
modid = CivilEngineering.MODID, modid = CivilEngineering.MODID,
name = CivilEngineering.NAME, name = CivilEngineering.NAME,
@ -26,17 +24,13 @@ public class CivilEngineering {
public static CivilEngineering instance; public static CivilEngineering instance;
public static Logger logger; public static Logger logger;
public static Configuration config;
@Mod.EventHandler @Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) { public void preInit(FMLPreInitializationEvent event) {
logger = event.getModLog(); logger = event.getModLog();
logger.info("Reading bridge blueprints..."); FMLEventHandler.preInit(event);
File directory = event.getModConfigurationDirectory();
config = new Configuration(new File(directory.getPath(), "CivilEngineering.cfg"));
Config.readConfig();
} }
@Mod.EventHandler @Mod.EventHandler
@ -45,11 +39,10 @@ public class CivilEngineering {
} }
@Mod.EventHandler @Mod.EventHandler
public void init(FMLPostInitializationEvent event) { public void postInit(FMLPostInitializationEvent event) {
logger.info("Bridge building post-init."); logger.info("Bridge building post-init.");
if (config.hasChanged()) {
config.save(); FMLEventHandler.postInit(event);
}
} }
} }

View File

@ -1,5 +1,7 @@
package arcanitor.civilengineering; package arcanitor.civilengineering;
import arcanitor.civilengineering.eventhandlers.FMLEventHandler;
import arcanitor.civilengineering.network.NetworkHandler;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Level;
@ -13,7 +15,7 @@ public class Config {
public static String connectURL = "localhost"; public static String connectURL = "localhost";
public static void readConfig() { public static void readConfig() {
Configuration config = CivilEngineering.config; Configuration config = FMLEventHandler.config;
try { try {
config.load(); config.load();
initConfig(config); initConfig(config);

View File

@ -6,7 +6,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod.EventBusSubscriber @Mod.EventBusSubscriber
public class HandleChatMessage { public class ChatMessageHandler {
@SubscribeEvent @SubscribeEvent
public static void handleServerChatEvent (ServerChatEvent event) { public static void handleServerChatEvent (ServerChatEvent event) {
CivilEngineering.logger.info("Message on server: "+event.getMessage()+" sent by "+event.getUsername()); CivilEngineering.logger.info("Message on server: "+event.getMessage()+" sent by "+event.getUsername());

View File

@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod.EventBusSubscriber @Mod.EventBusSubscriber
public class HandleDeath { public class DeathEventHandler {
@SubscribeEvent @SubscribeEvent
public static void handleLivingDeathEvent (LivingDeathEvent event) { public static void handleLivingDeathEvent (LivingDeathEvent event) {
if(Config.relayDeathEvents) { if(Config.relayDeathEvents) {

View File

@ -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();
}
}
}

View File

@ -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();
}
}