diff --git a/src/main/scala/li/cil/oc/common/IMC.scala b/src/main/scala/li/cil/oc/common/IMC.scala index 60e642864..a5075f50c 100644 --- a/src/main/scala/li/cil/oc/common/IMC.scala +++ b/src/main/scala/li/cil/oc/common/IMC.scala @@ -27,42 +27,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 usage '${message.getStringValue}' from mod ${message.getSender}.") + OpenComputers.log.debug(s"Registering new wrench usage '${message.getStringValue}' from mod ${message.getSender}.") try Wrench.addUsage(getStaticMethod(message.getStringValue, classOf[EntityPlayer], classOf[BlockPos], 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]) @@ -71,31 +71,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.getString()).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 7931849d7..511e34ac1 100644 --- a/src/main/scala/li/cil/oc/common/Loot.scala +++ b/src/main/scala/li/cil/oc/common/Loot.scala @@ -64,7 +64,7 @@ object Loot { def registerLootDisk(name: String, color: EnumDyeColor, 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 0f596b4f1..cfc3657f7 100644 --- a/src/main/scala/li/cil/oc/common/Proxy.scala +++ b/src/main/scala/li/cil/oc/common/Proxy.scala @@ -36,12 +36,12 @@ class Proxy { Settings.load(new File(e.getModConfigurationDirectory, "opencomputers" + File.separator + "settings.conf")) - 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() OpenComputers.log.info("Initializing capabilities.") diff --git a/src/main/scala/li/cil/oc/integration/Mods.scala b/src/main/scala/li/cil/oc/integration/Mods.scala index 96f978799..d98af60af 100644 --- a/src/main/scala/li/cil/oc/integration/Mods.scala +++ b/src/main/scala/li/cil/oc/integration/Mods.scala @@ -164,7 +164,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)