diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 8ab9b602..561b76fa 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -29,6 +29,8 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.*; import net.minecraftforge.fml.common.network.NetworkRegistry; import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.File; import java.util.List; @@ -39,14 +41,15 @@ public class BloodMagic { public static final String NAME = "Blood Magic: Alchemical Wizardry"; public static final String VERSION = "@VERSION@"; public static final String DEPEND = "required-after:guideapi;"; + public static final Logger LOGGER = LogManager.getLogger(NAME.substring(0, NAME.indexOf(":"))); + public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + public static final List> PLUGINS = Lists.newArrayList(); public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") { @Override public ItemStack getTabIconItem() { return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK); } }; - public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - public static final List> PLUGINS = Lists.newArrayList(); public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") { @Override public ItemStack getTabIconItem() { @@ -68,7 +71,6 @@ public class BloodMagic { FluidRegistry.enableUniversalBucket(); } - public LogHelper logger = new LogHelper(MODID); private File configDir; @Mod.EventHandler diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 093dbff0..ef1638a9 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -20,7 +20,7 @@ public class StorageBlockCraftingManager { public void addStorageBlockRecipes() { // this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes(); - BloodMagic.instance.logger.info("Total number of compression recipes: " + this.recipes.size()); + BloodMagic.LOGGER.info("Total number of compression recipes: {}", this.recipes.size()); } public ItemStack findMatchingRecipe(InventoryCrafting craftingInventory, World world) { diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java index c608e061..5a24233f 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java @@ -29,7 +29,7 @@ public class MeteorConfigHandler { public static void handleMeteors(boolean checkNewVersion) { if (meteorDir == null) { - BloodMagic.instance.logger.error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?"); + BloodMagic.LOGGER.error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?"); return; } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 3d9d0233..f414bb72 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -152,10 +152,9 @@ public class ClientProxy extends CommonProxy { Map skinMap = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "skinMap", "field_178636_l"); skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); skinMap.get("slim").addLayer(new LayerBloodElytra(skinMap.get("slim"))); - BloodMagic.instance.logger.info("Elytra layer added"); + BloodMagic.LOGGER.info("Elytra layer added"); } catch (Exception e) { - BloodMagic.instance.logger.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade."); - BloodMagic.instance.logger.error(e.getLocalizedMessage()); + BloodMagic.LOGGER.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade."); } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 85cfb7a8..e02c1d54 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -123,7 +123,7 @@ public class ModRecipes { CompressionRegistry.registerItemThreshold(new ItemStack(Blocks.COBBLESTONE), 64); stopwatch.stop(); - BloodMagic.instance.logger.info("Added compression recipes in {}", stopwatch); + BloodMagic.LOGGER.info("Added compression recipes in {}", stopwatch); } public static void addSoulForgeRecipes() { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 55512361..7218dfc1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -120,11 +120,11 @@ public class HarvestHandlerPlantable implements IHarvestHandler { HarvestRegistry.registerStandardCrop(crop, crop.getMaxAge()); } } catch (NoSuchMethodException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; unable to find crop name mapper"); + BloodMagic.LOGGER.error("HarvestCraft integration cancelled; unable to find crop name mapper"); } catch (IllegalAccessException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke"); + BloodMagic.LOGGER.error("HarvestCraft integration cancelled; crop name lookup broke"); } catch (InvocationTargetException e) { - BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke"); + BloodMagic.LOGGER.error("HarvestCraft integration cancelled; crop name lookup broke"); } } } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index b30a0ab0..fdfcb6a4 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -928,7 +928,7 @@ public class Utils { Class handlerClass = Class.forName(data.getClassName()); Object handlerImpl = handlerClass.newInstance(); MinecraftForge.EVENT_BUS.register(handlerImpl); - BloodMagic.instance.logger.debug("Registering event handler for class {}", data.getClassName()); + BloodMagic.LOGGER.debug("Registering event handler for class {}", data.getClassName()); } catch (Exception e) { // No-op } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 8c9aa9ee..7103ab7f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -210,10 +210,10 @@ public class ClientHandler { missingVariants.removeAll(missing); if (errored.size() > 0) - BloodMagic.instance.logger.info("Suppressed {} model errors from Blood Magic.", errored.size()); + BloodMagic.LOGGER.info("Suppressed {} model errors from Blood Magic.", errored.size()); if (missing.size() > 0) - BloodMagic.instance.logger.info("Suppressed {} variant errors from Blood Magic.", missing.size()); - BloodMagic.instance.logger.debug("Suppressed discovered model/variant errors in {}", stopwatch.stop()); + BloodMagic.LOGGER.info("Suppressed {} variant errors from Blood Magic.", missing.size()); + BloodMagic.LOGGER.debug("Suppressed discovered model/variant errors in {}", stopwatch.stop()); } // For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user. @@ -246,7 +246,7 @@ public class ClientHandler { missingTextures.keySet().remove(mc); badTextureDomains.remove(mc); } - BloodMagic.instance.logger.debug("Suppressed required texture errors in {}", stopwatch.stop()); + BloodMagic.LOGGER.debug("Suppressed required texture errors in {}", stopwatch.stop()); } private void renderRitualStones(EntityPlayerSP player, float partialTicks) {