diff --git a/src/mantle/Mantle.java b/src/mantle/Mantle.java index 81de9df..6083f1c 100644 --- a/src/mantle/Mantle.java +++ b/src/mantle/Mantle.java @@ -23,52 +23,55 @@ import mantle.internal.EnvironmentChecks; */ @Mod(modid = CoreRepo.modId, name = CoreRepo.modName, version = CoreRepo.modVersion, dependencies = "required-after:Forge@[8.9,)") @NetworkMod(clientSideRequired = true, serverSideRequired = false) -public class Mantle { - +public class Mantle +{ + public static final Logger logger = Logger.getLogger(CoreRepo.modName); + /** + * FML preinitialisation handler + * + * This is where we load our configs and related data, preparing for main load. + * + * @param evt The FMLPreInitializationEvent from FML + */ + @EventHandler + public void preInit (FMLPreInitializationEvent event) + { + logger.setParent(FMLCommonHandler.instance().getFMLLogger()); - /** - * FML preinitialisation handler - * - * This is where we load our configs and related data, preparing for main load. - * - * @param evt The FMLPreInitializationEvent from FML - */ - @EventHandler - public void preInit (FMLPreInitializationEvent event){ - logger.setParent(FMLCommonHandler.instance().getFMLLogger()); + CoreConfig.loadConfiguration(new Configuration(event.getSuggestedConfigurationFile())); - CoreConfig.loadConfiguration(new Configuration(event.getSuggestedConfigurationFile())); - - logger.info("Mantle (" + CoreRepo.modVersion + ") -- Preparing for launch."); - logger.info("Entering preinitialization phase."); + logger.info("Mantle (" + CoreRepo.modVersion + ") -- Preparing for launch."); + logger.info("Entering preinitialization phase."); - EnvironmentChecks.verifyEnvironmentSanity(); - } + EnvironmentChecks.verifyEnvironmentSanity(); + } - /** - * FML preinitialisation handler - * - * This is where we handle basic loading and populating any missing data in the Repo - * - * @param evt The FMLInitializationEvent from FML - */ - @EventHandler - public void Init (FMLPreInitializationEvent event){ - logger.info("Entering initialization phase."); - } + /** + * FML preinitialisation handler + * + * This is where we handle basic loading and populating any missing data in the Repo + * + * @param evt The FMLInitializationEvent from FML + */ + @EventHandler + public void Init (FMLPreInitializationEvent event) + { + logger.info("Entering initialization phase."); + } - /** - * FML preinitialisation handler - * - * Final chance for cleanup before main game launch - * - * @param evt The FMLPostInitializationEvent from FML - */ - @EventHandler - public void postInit (FMLPreInitializationEvent event){ - logger.info("Entering postinitialization phase."); - } + /** + * FML preinitialisation handler + * + * Final chance for cleanup before main game launch + * + * @param evt The FMLPostInitializationEvent from FML + */ + @EventHandler + public void postInit (FMLPreInitializationEvent event) + { + logger.info("Entering postinitialization phase."); + } } diff --git a/src/mantle/blocks/abstracts/InventoryLogic.java b/src/mantle/blocks/abstracts/InventoryLogic.java index 2b6b711..ff3fde6 100644 --- a/src/mantle/blocks/abstracts/InventoryLogic.java +++ b/src/mantle/blocks/abstracts/InventoryLogic.java @@ -12,8 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; /** - * NEEDS CONVERTED! - * * Abstract logic for inventory Tile Entities. * * @author mDiyo diff --git a/src/mantle/blocks/iface/IFacingLogic.java b/src/mantle/blocks/iface/IFacingLogic.java index 8bb8391..c7427a5 100644 --- a/src/mantle/blocks/iface/IFacingLogic.java +++ b/src/mantle/blocks/iface/IFacingLogic.java @@ -8,7 +8,8 @@ import net.minecraft.entity.EntityLivingBase; * * @author mDiyo */ -public interface IFacingLogic { +public interface IFacingLogic +{ public byte getRenderDirection (); diff --git a/src/mantle/internal/EnvironmentChecks.java b/src/mantle/internal/EnvironmentChecks.java index a45fd3f..fc97bd2 100644 --- a/src/mantle/internal/EnvironmentChecks.java +++ b/src/mantle/internal/EnvironmentChecks.java @@ -20,7 +20,8 @@ import mantle.internal.crash.CallableSuppConfig; * * @author Sunstrike */ -public class EnvironmentChecks { +public class EnvironmentChecks +{ public static boolean hasOptifine = false; @@ -38,7 +39,8 @@ public class EnvironmentChecks { if (Loader.isModLoaded("gregtech_addon")) { - Mantle.logger.severe("[Environment Checks] Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); + Mantle.logger + .severe("[Environment Checks] Gelatinous iceberg dead ahead! Entering Greggy waters! Abandon hope all ye who enter here! (No, seriously, we don't support GT. Don't report any issues. Thanks.)"); modIds.add("gregtech_addon"); } @@ -49,7 +51,6 @@ public class EnvironmentChecks { hasOptifine = true; } - try { Class cl = Class.forName("org.bukkit.Bukkit"); diff --git a/src/mantle/lib/CoreConfig.java b/src/mantle/lib/CoreConfig.java index b563c31..b9cb77d 100644 --- a/src/mantle/lib/CoreConfig.java +++ b/src/mantle/lib/CoreConfig.java @@ -11,21 +11,23 @@ import mantle.lib.CoreRepo.*; * * @author Sunstrike */ -public class CoreConfig { +public class CoreConfig +{ - /** - * Loads state from a Forge configuration object, or saves a new file if it doesn't already exist. - * - * @param config Configuration object (usually from a location given by FML in preinit) - */ - public static void loadConfiguration(Configuration config) { - Mantle.logger.info("Loading configuration from disk."); - config.load(); + /** + * Loads state from a Forge configuration object, or saves a new file if it doesn't already exist. + * + * @param config Configuration object (usually from a location given by FML in preinit) + */ + public static void loadConfiguration (Configuration config) + { + Mantle.logger.info("Loading configuration from disk."); + config.load(); - // TODO: Config vars get/set here + // TODO: Config vars get/set here - config.save(); - Mantle.logger.info("Configuration load completed."); - } + config.save(); + Mantle.logger.info("Configuration load completed."); + } } diff --git a/src/mantle/lib/CoreRepo.java b/src/mantle/lib/CoreRepo.java index 9fa094f..8562157 100644 --- a/src/mantle/lib/CoreRepo.java +++ b/src/mantle/lib/CoreRepo.java @@ -9,9 +9,10 @@ import java.util.logging.Logger; * * @author Sunstrike */ -public final class CoreRepo { +public final class CoreRepo +{ - public static final String modId = "Mantle"; + public static final String modId = "Mantle"; public static final String modName = "Mantle"; public static final String modVersion = "${version}"; diff --git a/src/mantle/world/CoordTupleSort.java b/src/mantle/world/CoordTupleSort.java index b911b67..9b8db31 100644 --- a/src/mantle/world/CoordTupleSort.java +++ b/src/mantle/world/CoordTupleSort.java @@ -28,4 +28,3 @@ public class CoordTupleSort implements Comparator return 0; } } -