From 09e0561bac609d0e966b3590672261050caf6380 Mon Sep 17 00:00:00 2001 From: kmecpp Date: Wed, 8 Aug 2018 18:48:12 -0400 Subject: [PATCH] Changed log level of some messages to reduce console spam --- src/main/scala/li/cil/oc/common/IMC.scala | 26 +++++++++---------- src/main/scala/li/cil/oc/common/Loot.scala | 2 +- src/main/scala/li/cil/oc/common/Proxy.scala | 8 +++--- .../scala/li/cil/oc/integration/Mods.scala | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/IMC.scala b/src/main/scala/li/cil/oc/common/IMC.scala index 9df8d2c32..cbaff8e89 100644 --- a/src/main/scala/li/cil/oc/common/IMC.scala +++ b/src/main/scala/li/cil/oc/common/IMC.scala @@ -26,42 +26,42 @@ object IMC { for (message <- e.getMessages) { if (message.key == "registerAssemblerTemplate" && message.isNBTMessage) { if (message.getNBTValue.hasKey("name", NBT.TAG_STRING)) - OpenComputers.log.info(s"Registering new assembler template '${message.getNBTValue.getString("name")}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new assembler template '${message.getNBTValue.getString("name")}' from mod ${message.getSender}.") else - OpenComputers.log.info(s"Registering new, unnamed assembler template from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new, unnamed assembler template from mod ${message.getSender}.") try AssemblerTemplates.add(message.getNBTValue) catch { case t: Throwable => OpenComputers.log.warn("Failed registering assembler template.", t) } } else if (message.key == "registerDisassemblerTemplate" && message.isNBTMessage) { if (message.getNBTValue.hasKey("name", NBT.TAG_STRING)) - OpenComputers.log.info(s"Registering new disassembler template '${message.getNBTValue.getString("name")}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new disassembler template '${message.getNBTValue.getString("name")}' from mod ${message.getSender}.") else - OpenComputers.log.info(s"Registering new, unnamed disassembler template from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new, unnamed disassembler template from mod ${message.getSender}.") try DisassemblerTemplates.add(message.getNBTValue) catch { case t: Throwable => OpenComputers.log.warn("Failed registering disassembler template.", t) } } else if (message.key == "registerToolDurabilityProvider" && message.isStringMessage) { - OpenComputers.log.info(s"Registering new tool durability provider '${message.getStringValue}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new tool durability provider '${message.getStringValue}' from mod ${message.getSender}.") try ToolDurabilityProviders.add(getStaticMethod(message.getStringValue, classOf[ItemStack])) catch { case t: Throwable => OpenComputers.log.warn("Failed registering tool durability provider.", t) } } else if (message.key == "registerWrenchTool" && message.isStringMessage) { - OpenComputers.log.info(s"Registering new wrench tool usage '${message.getStringValue}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new wrench tool usage '${message.getStringValue}' from mod ${message.getSender}.") try Wrench.addUsage(getStaticMethod(message.getStringValue, classOf[EntityPlayer], classOf[Int], classOf[Int], classOf[Int], classOf[Boolean])) catch { case t: Throwable => OpenComputers.log.warn("Failed registering wrench usage.", t) } } else if (message.key == "registerWrenchToolCheck" && message.isStringMessage) { - OpenComputers.log.info(s"Registering new wrench tool check '${message.getStringValue}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new wrench tool check '${message.getStringValue}' from mod ${message.getSender}.") try Wrench.addCheck(getStaticMethod(message.getStringValue, classOf[ItemStack])) catch { case t: Throwable => OpenComputers.log.warn("Failed registering wrench check.", t) } } else if (message.key == "registerItemCharge" && message.isNBTMessage) { - OpenComputers.log.info(s"Registering new item charge implementation '${message.getNBTValue.getString("name")}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new item charge implementation '${message.getNBTValue.getString("name")}' from mod ${message.getSender}.") try ItemCharge.add( getStaticMethod(message.getNBTValue.getString("canCharge"), classOf[ItemStack]), getStaticMethod(message.getNBTValue.getString("charge"), classOf[ItemStack], classOf[Double], classOf[Boolean]) @@ -70,31 +70,31 @@ object IMC { } } else if (message.key == "blacklistPeripheral" && message.isStringMessage) { - OpenComputers.log.info(s"Blacklisting CC peripheral '${message.getStringValue}' as requested by mod ${message.getSender}.") + OpenComputers.log.debug(s"Blacklisting CC peripheral '${message.getStringValue}' as requested by mod ${message.getSender}.") if (!Settings.get.peripheralBlacklist.contains(message.getStringValue)) { Settings.get.peripheralBlacklist.add(message.getStringValue) } } else if (message.key == "blacklistHost" && message.isNBTMessage) { - OpenComputers.log.info(s"Blacklisting component '${message.getNBTValue.getString("name")}' for host '${message.getNBTValue.getString("host")}' as requested by mod ${message.getSender}.") + OpenComputers.log.debug(s"Blacklisting component '${message.getNBTValue.getString("name")}' for host '${message.getNBTValue.getString("host")}' as requested by mod ${message.getSender}.") try Registry.blacklistHost(ItemStack.loadItemStackFromNBT(message.getNBTValue.getCompoundTag("item")), Class.forName(message.getNBTValue.getString("host"))) catch { case t: Throwable => OpenComputers.log.warn("Failed blacklisting component.", t) } } else if (message.key == "registerAssemblerFilter" && message.isStringMessage) { - OpenComputers.log.info(s"Registering new assembler template filter '${message.getStringValue}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new assembler template filter '${message.getStringValue}' from mod ${message.getSender}.") try AssemblerTemplates.addFilter(message.getStringValue) catch { case t: Throwable => OpenComputers.log.warn("Failed registering assembler template filter.", t) } } else if (message.key == "registerInkProvider" && message.isStringMessage) { - OpenComputers.log.info(s"Registering new ink provider '${message.getStringValue}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new ink provider '${message.getStringValue}' from mod ${message.getSender}.") try PrintData.addInkProvider(getStaticMethod(message.getStringValue, classOf[ItemStack])) catch { case t: Throwable => OpenComputers.log.warn("Failed registering ink provider.", t) } } else if (message.key == "registerProgramDiskLabel" && message.isNBTMessage) { - OpenComputers.log.info(s"Registering new program location mapping for program '${message.getNBTValue.getString("program")}' being on disk '${message.getNBTValue.getString("label")}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new program location mapping for program '${message.getNBTValue.getString("program")}' being on disk '${message.getNBTValue.getString("label")}' from mod ${message.getSender}.") ProgramLocations.addMapping(message.getNBTValue.getString("program"), message.getNBTValue.getString("label"), message.getNBTValue.getTagList("architectures", NBT.TAG_STRING).map((tag: NBTTagString) => tag.func_150285_a_()).toArray: _*) } else { diff --git a/src/main/scala/li/cil/oc/common/Loot.scala b/src/main/scala/li/cil/oc/common/Loot.scala index 0342d8c58..039fe715a 100644 --- a/src/main/scala/li/cil/oc/common/Loot.scala +++ b/src/main/scala/li/cil/oc/common/Loot.scala @@ -61,7 +61,7 @@ object Loot { def registerLootDisk(name: String, color: Int, factory: Callable[FileSystem], doRecipeCycling: Boolean): ItemStack = { val mod = Loader.instance.activeModContainer.getModId - OpenComputers.log.info(s"Registering loot disk '$name' from mod $mod.") + OpenComputers.log.debug(s"Registering loot disk '$name' from mod $mod.") val modSpecificName = mod + ":" + name diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala index abefeda7a..1f207ea6f 100644 --- a/src/main/scala/li/cil/oc/common/Proxy.scala +++ b/src/main/scala/li/cil/oc/common/Proxy.scala @@ -33,12 +33,12 @@ class Proxy { Settings.load(e.getSuggestedConfigurationFile) - OpenComputers.log.info("Initializing blocks and items.") + OpenComputers.log.debug("Initializing blocks and items.") Blocks.init() Items.init() - OpenComputers.log.info("Initializing additional OreDict entries.") + OpenComputers.log.debug("Initializing additional OreDict entries.") OreDictionary.registerOre("craftingPiston", net.minecraft.init.Blocks.piston) OreDictionary.registerOre("craftingPiston", net.minecraft.init.Blocks.sticky_piston) @@ -94,10 +94,10 @@ class Proxy { EntityRegistry.registerModEntity(classOf[Drone], "Drone", 0, OpenComputers, 80, 1, true) - OpenComputers.log.info("Initializing mod integration.") + OpenComputers.log.debug("Initializing mod integration.") Mods.init() - OpenComputers.log.info("Initializing recipes.") + OpenComputers.log.debug("Initializing recipes.") Recipes.init() api.API.isPowerEnabled = !Settings.get.ignorePower diff --git a/src/main/scala/li/cil/oc/integration/Mods.scala b/src/main/scala/li/cil/oc/integration/Mods.scala index 7ca2848b6..f24c39634 100644 --- a/src/main/scala/li/cil/oc/integration/Mods.scala +++ b/src/main/scala/li/cil/oc/integration/Mods.scala @@ -155,7 +155,7 @@ object Mods { val isBlacklisted = Settings.get.modBlacklist.contains(mod.getMod.id) val alwaysEnabled = mod.getMod == null || mod.getMod == Mods.Minecraft if (!isBlacklisted && (alwaysEnabled || mod.getMod.isModAvailable) && handlers.add(mod)) { - li.cil.oc.OpenComputers.log.info(s"Initializing mod integration for '${mod.getMod.id}'.") + li.cil.oc.OpenComputers.log.debug(s"Initializing mod integration for '${mod.getMod.id}'.") try mod.initialize() catch { case e: Throwable => li.cil.oc.OpenComputers.log.warn(s"Error initializing integration for '${mod.getMod.id}'", e)