From abf13e088afb57934ba78e799364b8fe2e040513 Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Tue, 10 Apr 2018 17:39:30 +0200 Subject: [PATCH] Make use of FMLLoadCompleteEvent --- .../java/exopandora/worldhandler/main/Main.java | 1 + .../worldhandler/main/WorldHandler.java | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/exopandora/worldhandler/main/Main.java b/src/main/java/exopandora/worldhandler/main/Main.java index 9622f38..8912b17 100644 --- a/src/main/java/exopandora/worldhandler/main/Main.java +++ b/src/main/java/exopandora/worldhandler/main/Main.java @@ -22,6 +22,7 @@ public class Main public static final String NAME_AND_VERSION = NAME + " " + FULL_VERSION; public static final String URL = "https://minecraft.curseforge.com/projects/world-handler-command-gui"; public static final String UPDATE_URL = "https://raw.githubusercontent.com/Exopandora/worldhandler/master/version.json"; + public static final String CERTIFICATE = "d6261bb645f41db84c74f98e512c2bb43f188af2"; public static void main(String[] args) { diff --git a/src/main/java/exopandora/worldhandler/main/WorldHandler.java b/src/main/java/exopandora/worldhandler/main/WorldHandler.java index fc9cf9a..9258e54 100644 --- a/src/main/java/exopandora/worldhandler/main/WorldHandler.java +++ b/src/main/java/exopandora/worldhandler/main/WorldHandler.java @@ -27,6 +27,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; @@ -34,7 +35,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -@Mod(modid = Main.MODID, name = Main.NAME, acceptedMinecraftVersions = "[" + Main.MC_COMPATIBLE + ",)", version = Main.VERSION, canBeDeactivated = false, guiFactory = "exopandora.worldhandler.gui.config.GuiFactoryWorldHandler", updateJSON = Main.UPDATE_URL, clientSideOnly = true) +@Mod(modid = Main.MODID, name = Main.NAME, acceptedMinecraftVersions = "[" + Main.MC_COMPATIBLE + ",)", version = Main.VERSION, canBeDeactivated = false, guiFactory = "exopandora.worldhandler.gui.config.GuiFactoryWorldHandler", updateJSON = Main.UPDATE_URL, clientSideOnly = true, certificateFingerprint = Main.CERTIFICATE) public class WorldHandler { @Instance(Main.MODID) @@ -60,7 +61,7 @@ public class WorldHandler public void preInit(FMLPreInitializationEvent event) { LOGGER = event.getModLog(); - LOGGER.info("Pre-Initializing " + Main.NAME_AND_VERSION); + LOGGER.info("Pre-Initialisation"); LOGGER.info("First Release on March 28 2013 - 02:29 PM CET by Exopandora"); LOGGER.info("Latest Version: " + Main.URL); CONFIG = new Configuration(event.getSuggestedConfigurationFile()); @@ -73,7 +74,7 @@ public class WorldHandler @EventHandler public void init(FMLInitializationEvent event) { - LOGGER.info("Initializing " + Main.NAME_AND_VERSION); + LOGGER.info("Initialisation"); USERNAME = Minecraft.getMinecraft().getSession().getUsername(); MinecraftForge.EVENT_BUS.register(new exopandora.worldhandler.event.EventHandler()); @@ -84,9 +85,13 @@ public class WorldHandler @EventHandler public void postInit(FMLPostInitializationEvent event) { - LOGGER.info("Post-Initializing " + Main.NAME_AND_VERSION); - LOGGER.info("Every mod that has not been registered to this point may not be fully featured in this mod"); - + LOGGER.info("Post-Initialisation"); + } + + @EventHandler + public void loadComplete(FMLLoadCompleteEvent event) + { + LOGGER.info("Load-Complete"); ConfigButcher.load(CONFIG); Content.registerContents(); Category.registerCategories();